image: CD backend: Allow choice of graphics / text

Combined with adelie/image@7df95115f4, this allows a user to choose
whether to boot to a graphical environment or drop to a text prompt.

Implements: #346

5 files changed, 47 insertions, 5 deletions

diff --git a/image/iso-share/post-aarch64.sh b/image/iso-share/post-aarch64.sh
index 6e13293..b77dbd4 100755
--- a/image/iso-share/post-aarch64.sh
+++ b/image/iso-share/post-aarch64.sh
@@ -8,7 +8,15 @@ set prefix=($root)/boot
 EARLYCFG
 
 cat >cdroot/boot/grub.cfg <<'GRUBCFG'
-menuentry "Adelie Linux Live (64-bit Arm)" --class linux --id adelie-live-cd {
+menuentry "Adelie Linux Live (64-bit Arm)" --class linux --id adelie-live-cd-aarch64 {
+        insmod iso9660
+        insmod linux
+        search --label "Adelie-aarch64" --no-floppy --set
+        linux ($root)/kernel-aarch64 root=live:LABEL=Adelie-aarch64 rd.live.dir=/ rd.live.squashimg=aarch64.squashfs softlevel=graphical
+        initrd ($root)/initrd-aarch64
+}
+
+menuentry "Adelie Linux Live (64-bit Arm) (text-only)" --class linux --id adelie-live-cd-aarch64-text {
         insmod iso9660
         insmod linux
         search --label "Adelie-aarch64" --no-floppy --set
diff --git a/image/iso-share/post-pmmx.sh b/image/iso-share/post-pmmx.sh
index 3b8d518..6ac9cc3 100755
--- a/image/iso-share/post-pmmx.sh
+++ b/image/iso-share/post-pmmx.sh
@@ -8,7 +8,15 @@ set prefix=($root)/boot
 EARLYCFG
 
 cat >cdroot/boot/grub.cfg <<'GRUBCFG'
-menuentry "Adelie Linux Live (Intel 32-bit)" --class linux --id adelie-live-cd {
+menuentry "Adelie Linux Live (Intel 32-bit)" --class linux --id adelie-live-cd-pmmx {
+        insmod iso9660
+        insmod linux
+        search --label "Adelie-pmmx" --no-floppy --set
+        linux ($root)/kernel-pmmx root=live:LABEL=Adelie-pmmx rd.live.dir=/ rd.live.squashimg=pmmx.squashfs softlevel=graphical
+        initrd ($root)/initrd-pmmx
+}
+
+menuentry "Adelie Linux Live (Intel 32-bit) (text-only)" --class linux --id adelie-live-cd-pmmx-text {
         insmod iso9660
         insmod linux
         search --label "Adelie-pmmx" --no-floppy --set
diff --git a/image/iso-share/post-ppc.sh b/image/iso-share/post-ppc.sh
index e834d7b..61aaca8 100644
--- a/image/iso-share/post-ppc.sh
+++ b/image/iso-share/post-ppc.sh
@@ -19,7 +19,16 @@ rm early.cfg
 cp cdroot/VolumeIcon.icns 'cdroot/Icon
'
 
 cat >cdroot/boot/grub.cfg <<'GRUBCFG'
-menuentry "Adelie Linux Live (PowerPC 32-bit)" --class linux --id adelie-live-cd {
+menuentry "Adelie Linux Live (PowerPC 32-bit)" --class linux --id adelie-live-cd-ppc {
+        insmod part_apple
+        insmod iso9660
+        insmod linux
+        search --label "Adelie-ppc" --hint cd,apple2 --no-floppy --set
+        linux ($root)/kernel-ppc root=live:LABEL=Adelie-ppc rd.live.dir=/ rd.live.squashimg=ppc.squashfs softlevel=graphical
+        initrd ($root)/initrd-ppc
+}
+
+menuentry "Adelie Linux Live (PowerPC 32-bit) (text-only)" --class linux --id adelie-live-cd-ppc-text {
         insmod part_apple
         insmod iso9660
         insmod linux
diff --git a/image/iso-share/post-ppc64.sh b/image/iso-share/post-ppc64.sh
index bf3e7b9..66e593a 100755
--- a/image/iso-share/post-ppc64.sh
+++ b/image/iso-share/post-ppc64.sh
@@ -21,7 +21,16 @@ cp cdroot/VolumeIcon.icns 'cdroot/Icon
'
 
 mkdir -p cdroot/boot/grub
 cat >cdroot/boot/grub/grub.cfg <<'GRUBCFG'
-menuentry "Adelie Linux Live (PowerPC 64-bit)" --class linux --id adelie-live-cd {
+menuentry "Adelie Linux Live (PowerPC 64-bit)" --class linux --id adelie-live-cd-ppc64 {
+        insmod part_apple
+        insmod iso9660
+        insmod linux
+        search --label "Adelie-ppc64" --hint cd,apple2 --no-floppy --set
+        linux /kernel-ppc64 root=live:LABEL=Adelie-ppc64 rd.live.dir=/ rd.live.squashimg=ppc64.squashfs softlevel=graphical
+        initrd /initrd-ppc64
+}
+
+menuentry "Adelie Linux Live (PowerPC 64-bit) (text-only)" --class linux --id adelie-live-cd-ppc64-text {
         insmod part_apple
         insmod iso9660
         insmod linux
diff --git a/image/iso-share/post-x86_64.sh b/image/iso-share/post-x86_64.sh
index e8b904d..8ede382 100755
--- a/image/iso-share/post-x86_64.sh
+++ b/image/iso-share/post-x86_64.sh
@@ -8,7 +8,15 @@ set prefix=($root)/boot
 EARLYCFG
 
 cat >cdroot/boot/grub.cfg <<'GRUBCFG'
-menuentry "Adelie Linux Live (Intel 64-bit)" --class linux --id adelie-live-cd {
+menuentry "Adelie Linux Live (Intel 64-bit)" --class linux --id adelie-live-cd-x64 {
+        insmod iso9660
+        insmod linux
+        search --label "Adelie-x86_64" --no-floppy --set
+        linux ($root)/kernel-x86_64 root=live:LABEL=Adelie-x86_64 rd.live.dir=/ rd.live.squashimg=x86_64.squashfs softlevel=graphical
+        initrd ($root)/initrd-x86_64
+}
+
+menuentry "Adelie Linux Live (Intel 64-bit) (text-only)" --class linux --id adelie-live-cd-x64-text {
         insmod iso9660
         insmod linux
         search --label "Adelie-x86_64" --no-floppy --set