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

10 files changed, 20 insertions, 33 deletions

diff --git a/packages/arch/ppc64 b/packages/arch/ppc64
index c8d667f..87a20f4 100644
--- a/packages/arch/ppc64
+++ b/packages/arch/ppc64
@@ -1,4 +1,2 @@
-easy-kernel-power8
-easy-kernel-power8-modules
 grub-ieee1275
 mac-fdisk
diff --git a/post/arch/ppc64.sh b/post/arch/ppc64.sh
index dd4a5b9..9b98d0c 100755
--- a/post/arch/ppc64.sh
+++ b/post/arch/ppc64.sh
@@ -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
diff --git a/ppc/early.cfg b/ppc/early.cfg
index 8568233..ef47255 100644
--- a/ppc/early.cfg
+++ b/ppc/early.cfg
@@ -1,2 +1,2 @@
-search.fs_label "Adelie 1.0b4 ppc" root
+search.fs_label "Adelie 1.0rc1 ppc" --no-floppy root
 set prefix=($root)/boot
diff --git a/ppc/early.cfg64 b/ppc/early.cfg64
index 78e84aa..a65f671 100644
--- a/ppc/early.cfg64
+++ b/ppc/early.cfg64
@@ -1,2 +1,2 @@
-search.fs_label "Adelie 1.0b4 ppc64" root
+search.fs_label "Adelie 1.0rc1 ppc64" root
 set prefix=($root)/boot
diff --git a/ppc/grub.cfg b/ppc/grub.cfg
index 5d7ea3e..284f650 100644
--- a/ppc/grub.cfg
+++ b/ppc/grub.cfg
@@ -1,10 +1,10 @@
-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 {
diff --git a/ppc/grub.cfg64 b/ppc/grub.cfg64
index 02c6d6b..97e0deb 100644
--- a/ppc/grub.cfg64
+++ b/ppc/grub.cfg64
@@ -1,19 +1,10 @@
-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 {
diff --git a/x86/early.cfg b/x86/early.cfg
index 259d3e6..dc1f831 100644
--- a/x86/early.cfg
+++ b/x86/early.cfg
@@ -1,2 +1,2 @@
-search.fs_label "Adelie 1.0b4 pmmx" root
+search.fs_label "Adelie 1.0rc1 pmmx" --no-floppy root
 set prefix=($root)/boot
diff --git a/x86/early.cfg64 b/x86/early.cfg64
index e5635f6..1d410e6 100644
--- a/x86/early.cfg64
+++ b/x86/early.cfg64
@@ -1,2 +1,2 @@
-search.fs_label "Adelie 1.0b4 x86_64" root
+search.fs_label "Adelie 1.0rc1 x86_64" --no-floppy root
 set prefix=($root)/boot
diff --git a/x86/grub.cfg b/x86/grub.cfg
index 45c05bf..d76baeb 100644
--- a/x86/grub.cfg
+++ b/x86/grub.cfg
@@ -1,9 +1,9 @@
-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 {
diff --git a/x86/grub.cfg64 b/x86/grub.cfg64
index edddd9b..1b848fc 100644
--- a/x86/grub.cfg64
+++ b/x86/grub.cfg64
@@ -1,9 +1,9 @@
-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 {