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

Update boot scripts for RC1 changes; kill easy-kernel-p8

parent 44905a2b
easy-kernel-power8
easy-kernel-power8-modules
grub-ieee1275
mac-fdisk
......@@ -19,5 +19,3 @@ cp ppc/grub.cfg64 cdroot-ppc64/boot/grub/grub.cfg
# Fix CHRP
mkdir cdroot-ppc64/ppc
cp cdroot-ppc64/boot/bootinfo.txt cdroot-ppc64/ppc/bootinfo.txt
mv squashroot-ppc64/boot/vmlinux-4.14.138-mc15-easy-power8 cdroot-ppc64/bzImage-p8
search.fs_label "Adelie 1.0b4 ppc" root
search.fs_label "Adelie 1.0rc1 ppc" --no-floppy root
set prefix=($root)/boot
search.fs_label "Adelie 1.0b4 ppc64" root
search.fs_label "Adelie 1.0rc1 ppc64" root
set prefix=($root)/boot
menuentry "Adelie Linux 1.0-BETA4 Live (PowerPC 32-bit)" --class linux --id adelie-live-cd {
menuentry "Adelie Linux 1.0-RC1 Live (PowerPC 32-bit)" --class linux --id adelie-live-cd {
insmod part_apple
insmod iso9660
insmod linux
search --label "Adelie 1.0b4 ppc" --hint cd,apple2
linux /bzImage
initrd /initrd
search --label "Adelie 1.0rc1 ppc" --hint cd,apple2 --no-floppy root
linux ($root)/bzImage
initrd ($root)/initrd
}
menuentry "Reboot and Try Again" --class reboot --id reboot {
......
menuentry "Adelie Linux 1.0-BETA4 Live (PowerPC 64-bit)" --class linux --id adelie-live-64 {
menuentry "Adelie Linux 1.0-RC1 Live (PowerPC 64-bit)" --class linux --id adelie-live-64 {
insmod part_apple
insmod iso9660
insmod linux
search --label "Adelie 1.0b3 ppc64" --hint cd,apple2
linux /bzImage
initrd /initrd
}
menuentry "Adelie Linux 1.0-BETA4 Live (PowerPC 64-bit - POWER8 and newer CPUs)" --class linux --id adelie-live-p8 {
insmod part_apple
insmod iso9660
insmod linux
search --label "Adelie 1.0b4 ppc64" --hint cd,apple2
linux /bzImage-p8
initrd /initrd
search --label "Adelie 1.0rc1 ppc64" --hint cd,apple2 --no-floppy root
linux ($root)/bzImage
initrd ($root)/initrd
}
menuentry "Reboot and Try Again" --class reboot --id reboot {
......
search.fs_label "Adelie 1.0b4 pmmx" root
search.fs_label "Adelie 1.0rc1 pmmx" --no-floppy root
set prefix=($root)/boot
search.fs_label "Adelie 1.0b4 x86_64" root
search.fs_label "Adelie 1.0rc1 x86_64" --no-floppy root
set prefix=($root)/boot
menuentry "Adelie Linux 1.0-BETA4 Live (Intel 32-bit)" --class linux --id adelie-live-cd {
menuentry "Adelie Linux 1.0-RC1 Live (Intel 32-bit)" --class linux --id adelie-live-cd {
insmod iso9660
insmod linux
search --label "Adelie 1.0b4 pmmx"
linux /bzImage
initrd /initrd
search --label "Adelie 1.0rc1 pmmx" --no-floppy root
linux ($root)/bzImage
initrd ($root)/initrd
}
menuentry "Reboot and Try Again" --class reboot --id reboot {
......
menuentry "Adelie Linux 1.0-BETA4 Live (Intel 64-bit)" --class linux --id adelie-live-64 {
menuentry "Adelie Linux 1.0-RC1 Live (Intel 64-bit)" --class linux --id adelie-live-64 {
insmod iso9660
insmod linux
search --label "Adelie 1.0b4 x86_64"
linux /bzImage
initrd /initrd
search --label "Adelie 1.0rc1 x86_64" --no-floppy root
linux ($root)/bzImage
initrd ($root)/initrd
}
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