Verified Commit ae61fe98 authored by A. Wilcox's avatar A. Wilcox 🦊
Browse files

Use arch suffixes for bzImage/initrd/squashfs; fix GRUB root set

parent ac8601cb
......@@ -256,7 +256,7 @@ make_structure() {
squash_it() {
header 'Creating compressed file system image...'
mksquashfs squashroot-$ARCH cdroot-$ARCH/adelie.squashfs -noappend
mksquashfs squashroot-$ARCH cdroot-$ARCH/$ARCH.squashfs -noappend
}
make_initrd() {
......@@ -304,9 +304,9 @@ make_initrd() {
header 'Compressing initrd...'
(cd initrd-$ARCH; find . | cpio -H newc -o) > cdroot-$ARCH/initrd
gzip -9 cdroot-$ARCH/initrd
mv cdroot-$ARCH/initrd.gz cdroot-$ARCH/initrd
(cd initrd-$ARCH; find . | cpio -H newc -o) > cdroot-$ARCH/initrd-$ARCH
gzip -9 cdroot-$ARCH/initrd-$ARCH
mv cdroot-$ARCH/initrd-$ARCH.gz cdroot-$ARCH/initrd-$ARCH
}
prepare_cdroot() {
......@@ -322,7 +322,7 @@ prepare_cdroot() {
header 'Adding kernel...'
mv squashroot-$ARCH/boot/vmlinu* cdroot-$ARCH/bzImage
mv squashroot-$ARCH/boot/vmlinu* cdroot-$ARCH/bzImage-$ARCH
}
create_iso() {
......
search.fs_label "Adelie 1.0rc1 ppc" --no-floppy root
search.fs_label "Adelie 1.0rc1 ppc" --no-floppy --set
set prefix=($root)/boot
search.fs_label "Adelie 1.0rc1 ppc64" root
search.fs_label "Adelie 1.0rc1 ppc64" --no-floppy --set
set prefix=($root)/boot
......@@ -2,9 +2,9 @@ menuentry "Adelie Linux 1.0-RC1 Live (PowerPC 32-bit)" --class linux --id adelie
insmod part_apple
insmod iso9660
insmod linux
search --label "Adelie 1.0rc1 ppc" --hint cd,apple2 --no-floppy root
linux ($root)/bzImage
initrd ($root)/initrd
search --label "Adelie 1.0rc1 ppc" --hint cd,apple2 --no-floppy --set
linux ($root)/bzImage-ppc squashroot=ppc.squashfs
initrd ($root)/initrd-ppc
}
menuentry "Reboot and Try Again" --class reboot --id reboot {
......
......@@ -2,9 +2,9 @@ menuentry "Adelie Linux 1.0-RC1 Live (PowerPC 64-bit)" --class linux --id adelie
insmod part_apple
insmod iso9660
insmod linux
search --label "Adelie 1.0rc1 ppc64" --hint cd,apple2 --no-floppy root
linux ($root)/bzImage
initrd ($root)/initrd
search --label "Adelie 1.0rc1 ppc64" --hint cd,apple2 --no-floppy --set
linux ($root)/bzImage-ppc64 squashroot=ppc64.squashfs
initrd ($root)/initrd-ppc64
}
menuentry "Reboot and Try Again" --class reboot --id reboot {
......
search.fs_label "Adelie 1.0rc1 pmmx" --no-floppy root
search.fs_label "Adelie 1.0rc1 pmmx" --no-floppy --set
set prefix=($root)/boot
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
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 {
......
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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment