summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-10-10 10:35:01 -0400
committerAndrew Cady <d@jerkface.net>2020-10-10 10:35:01 -0400
commitca549a48857ab58e8f714665fd93d6fcdf2d0ebe (patch)
tree49e522d6a1111bbc0696fa279209ce221ae1ee62
parentad4d954d43903563c9a1449c63b0ee3f3979bc33 (diff)
fixup! parted-usb: add grub.cfg late
-rw-r--r--conf/grub.cfg22
-rwxr-xr-xsrc/parted-usb.sh2
2 files changed, 23 insertions, 1 deletions
diff --git a/conf/grub.cfg b/conf/grub.cfg
new file mode 100644
index 0000000..021d29b
--- /dev/null
+++ b/conf/grub.cfg
@@ -0,0 +1,22 @@
1insmod echo
2echo GRUB (samizdat)
3
4insmod normal
5insmod keystatus
6
7insmod linux
8
9insmod part_gpt
10insmod part_msdos
11insmod btrfs
12
13echo Loading vmlinuz...
14linux /linux/vmlinuz boot=samizdat quiet
15
16echo Loading initrd.img...
17initrd /linux/initrd.img
18
19echo Booting.
20echo
21boot
22
diff --git a/src/parted-usb.sh b/src/parted-usb.sh
index 6841166..bb63070 100755
--- a/src/parted-usb.sh
+++ b/src/parted-usb.sh
@@ -110,7 +110,7 @@ sanity_checks()
110. samizdat-paths.sh || die 'samizdat-paths.sh not found' 110. samizdat-paths.sh || die 'samizdat-paths.sh not found'
111samizdat_linux_dir=/boot 111samizdat_linux_dir=/boot
112: ${GPG_INPUT_DIR:=/cdrom/gnupghome} 112: ${GPG_INPUT_DIR:=/cdrom/gnupghome}
113: ${GRUB_CONFIG:=grub.cfg} 113: ${GRUB_CONFIG:=conf/grub.cfg}
114start_keys=64 # megs 114start_keys=64 # megs
115end_keys=256 # megs 115end_keys=256 # megs
116target=fallacy.img.tmp 116target=fallacy.img.tmp