diff options
author | Andrew Cady <d@jerkface.net> | 2020-10-10 10:35:01 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2020-10-10 10:35:01 -0400 |
commit | ca549a48857ab58e8f714665fd93d6fcdf2d0ebe (patch) | |
tree | 49e522d6a1111bbc0696fa279209ce221ae1ee62 | |
parent | ad4d954d43903563c9a1449c63b0ee3f3979bc33 (diff) |
fixup! parted-usb: add grub.cfg late
-rw-r--r-- | conf/grub.cfg | 22 | ||||
-rwxr-xr-x | src/parted-usb.sh | 2 |
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 @@ | |||
1 | insmod echo | ||
2 | echo GRUB (samizdat) | ||
3 | |||
4 | insmod normal | ||
5 | insmod keystatus | ||
6 | |||
7 | insmod linux | ||
8 | |||
9 | insmod part_gpt | ||
10 | insmod part_msdos | ||
11 | insmod btrfs | ||
12 | |||
13 | echo Loading vmlinuz... | ||
14 | linux /linux/vmlinuz boot=samizdat quiet | ||
15 | |||
16 | echo Loading initrd.img... | ||
17 | initrd /linux/initrd.img | ||
18 | |||
19 | echo Booting. | ||
20 | echo | ||
21 | boot | ||
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' |
111 | samizdat_linux_dir=/boot | 111 | samizdat_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} |
114 | start_keys=64 # megs | 114 | start_keys=64 # megs |
115 | end_keys=256 # megs | 115 | end_keys=256 # megs |
116 | target=fallacy.img.tmp | 116 | target=fallacy.img.tmp |