diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-02 15:38:13 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-02 15:38:13 -0600 |
| commit | ae61fe98419a46847009f0153d6b2e43f5bed891 (patch) | |
| tree | 5f8cf9fcb2f7f6805dcaac701f2db66c68a91d68 /x86 | |
| parent | ac8601cb7ef8f6bc2e18a664320c70fe12f1f055 (diff) | |
| download | image-ae61fe98419a46847009f0153d6b2e43f5bed891.tar.gz image-ae61fe98419a46847009f0153d6b2e43f5bed891.tar.bz2 image-ae61fe98419a46847009f0153d6b2e43f5bed891.tar.xz image-ae61fe98419a46847009f0153d6b2e43f5bed891.zip | |
Use arch suffixes for bzImage/initrd/squashfs; fix GRUB root set
Diffstat (limited to 'x86')
| -rw-r--r-- | x86/early.cfg | 2 | ||||
| -rw-r--r-- | x86/early.cfg64 | 2 | ||||
| -rw-r--r-- | x86/grub.cfg | 6 | ||||
| -rw-r--r-- | x86/grub.cfg64 | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/x86/early.cfg b/x86/early.cfg index dc1f831..bc8fd12 100644 --- a/x86/early.cfg +++ b/x86/early.cfg @@ -1,2 +1,2 @@ -search.fs_label "Adelie 1.0rc1 pmmx" --no-floppy root +search.fs_label "Adelie 1.0rc1 pmmx" --no-floppy --set set prefix=($root)/boot diff --git a/x86/early.cfg64 b/x86/early.cfg64 index 1d410e6..4d09107 100644 --- a/x86/early.cfg64 +++ b/x86/early.cfg64 @@ -1,2 +1,2 @@ -search.fs_label "Adelie 1.0rc1 x86_64" --no-floppy root +search.fs_label "Adelie 1.0rc1 x86_64" --no-floppy --set set prefix=($root)/boot diff --git a/x86/grub.cfg b/x86/grub.cfg index d76baeb..e9f657d 100644 --- a/x86/grub.cfg +++ b/x86/grub.cfg @@ -1,9 +1,9 @@ menuentry "Adelie Linux 1.0-RC1 Live (Intel 32-bit)" --class linux --id adelie-live-cd { insmod iso9660 insmod linux - search --label "Adelie 1.0rc1 pmmx" --no-floppy root - linux ($root)/bzImage - initrd ($root)/initrd + search --label "Adelie 1.0rc1 pmmx" --no-floppy --set + linux ($root)/bzImage-pmmx squashroot=pmmx.squashfs + initrd ($root)/initrd-pmmx } menuentry "Reboot and Try Again" --class reboot --id reboot { diff --git a/x86/grub.cfg64 b/x86/grub.cfg64 index 1b848fc..dbcdf66 100644 --- a/x86/grub.cfg64 +++ b/x86/grub.cfg64 @@ -1,9 +1,9 @@ menuentry "Adelie Linux 1.0-RC1 Live (Intel 64-bit)" --class linux --id adelie-live-64 { insmod iso9660 insmod linux - search --label "Adelie 1.0rc1 x86_64" --no-floppy root - linux ($root)/bzImage - initrd ($root)/initrd + search --label "Adelie 1.0rc1 x86_64" --no-floppy --set + linux ($root)/bzImage-x86_64 squashroot=x86_64.squashfs + initrd ($root)/initrd-x86_64 } menuentry "Reboot and Try Again" --class reboot --id reboot { |