From 89b9bbdc96d48b9e1d4d6b6036dd504f42409561 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 29 Aug 2020 07:22:38 -0500 Subject: image: Convert custom cdinit to Dracut --- image/iso-share/cdinits/cdinit-pmmx | Bin 19260 -> 0 bytes image/iso-share/cdinits/cdinit-ppc | Bin 74268 -> 0 bytes image/iso-share/cdinits/cdinit-ppc64 | Bin 75608 -> 0 bytes image/iso-share/cdinits/cdinit-x86 | Bin 11892 -> 0 bytes image/iso-share/cdinits/cdinit-x86_64 | Bin 20792 -> 0 bytes image/iso-share/post-pmmx.sh | 6 +++--- image/iso-share/post-ppc.sh | 6 +++--- image/iso-share/post-ppc64.sh | 6 +++--- image/iso-share/post-x86_64.sh | 6 +++--- 9 files changed, 12 insertions(+), 12 deletions(-) delete mode 100755 image/iso-share/cdinits/cdinit-pmmx delete mode 100755 image/iso-share/cdinits/cdinit-ppc delete mode 100755 image/iso-share/cdinits/cdinit-ppc64 delete mode 100755 image/iso-share/cdinits/cdinit-x86 delete mode 100755 image/iso-share/cdinits/cdinit-x86_64 (limited to 'image/iso-share') diff --git a/image/iso-share/cdinits/cdinit-pmmx b/image/iso-share/cdinits/cdinit-pmmx deleted file mode 100755 index c59bcfb..0000000 Binary files a/image/iso-share/cdinits/cdinit-pmmx and /dev/null differ diff --git a/image/iso-share/cdinits/cdinit-ppc b/image/iso-share/cdinits/cdinit-ppc deleted file mode 100755 index f98d2c4..0000000 Binary files a/image/iso-share/cdinits/cdinit-ppc and /dev/null differ diff --git a/image/iso-share/cdinits/cdinit-ppc64 b/image/iso-share/cdinits/cdinit-ppc64 deleted file mode 100755 index 1e5dcdb..0000000 Binary files a/image/iso-share/cdinits/cdinit-ppc64 and /dev/null differ diff --git a/image/iso-share/cdinits/cdinit-x86 b/image/iso-share/cdinits/cdinit-x86 deleted file mode 100755 index e4df83e..0000000 Binary files a/image/iso-share/cdinits/cdinit-x86 and /dev/null differ diff --git a/image/iso-share/cdinits/cdinit-x86_64 b/image/iso-share/cdinits/cdinit-x86_64 deleted file mode 100755 index 366dc48..0000000 Binary files a/image/iso-share/cdinits/cdinit-x86_64 and /dev/null differ diff --git a/image/iso-share/post-pmmx.sh b/image/iso-share/post-pmmx.sh index 09aeea5..3b8d518 100755 --- a/image/iso-share/post-pmmx.sh +++ b/image/iso-share/post-pmmx.sh @@ -3,7 +3,7 @@ mkdir -p cdroot/boot cat >early.cfg <<'EARLYCFG' -search.fs_label "Adelie pmmx" root +search.fs_label "Adelie-pmmx" root set prefix=($root)/boot EARLYCFG @@ -11,8 +11,8 @@ cat >cdroot/boot/grub.cfg <<'GRUBCFG' menuentry "Adelie Linux Live (Intel 32-bit)" --class linux --id adelie-live-cd { insmod iso9660 insmod linux - search --label "Adelie pmmx" --no-floppy --set - linux ($root)/kernel-pmmx squashroot=pmmx.squashfs + search --label "Adelie-pmmx" --no-floppy --set + linux ($root)/kernel-pmmx root=live:LABEL=Adelie-pmmx rd.live.dir=/ rd.live.squashimg=pmmx.squashfs initrd ($root)/initrd-pmmx } diff --git a/image/iso-share/post-ppc.sh b/image/iso-share/post-ppc.sh index 9623a50..e834d7b 100644 --- a/image/iso-share/post-ppc.sh +++ b/image/iso-share/post-ppc.sh @@ -3,7 +3,7 @@ mkdir -p cdroot/boot cat >early.cfg <<'EARLYCFG' -search.fs_label "Adelie ppc" root +search.fs_label "Adelie-ppc" root set prefix=($root)/boot EARLYCFG @@ -23,8 +23,8 @@ menuentry "Adelie Linux Live (PowerPC 32-bit)" --class linux --id adelie-live-cd insmod part_apple insmod iso9660 insmod linux - search --label "Adelie ppc" --hint cd,apple2 --no-floppy --set - linux ($root)/kernel-ppc squashroot=ppc.squashfs + 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 initrd ($root)/initrd-ppc } diff --git a/image/iso-share/post-ppc64.sh b/image/iso-share/post-ppc64.sh index e5b5c65..7c6e76f 100755 --- a/image/iso-share/post-ppc64.sh +++ b/image/iso-share/post-ppc64.sh @@ -4,7 +4,7 @@ mkdir -p cdroot/boot # /boot/grub instead of /boot for Petitboot compatibility. cat >early.cfg <<'EARLYCFG' -search.fs_label "Adelie ppc64" root +search.fs_label "Adelie-ppc64" root set prefix=($root)/boot/grub EARLYCFG @@ -25,8 +25,8 @@ menuentry "Adelie Linux Live (PowerPC 64-bit)" --class linux --id adelie-live-cd insmod part_apple insmod iso9660 insmod linux - search --label "Adelie ppc64" --hint cd,apple2 --no-floppy --set - linux ($root)/kernel-ppc64 squashroot=ppc64.squashfs + search --label "Adelie-ppc64" --hint cd,apple2 --no-floppy --set + linux ($root)/kernel-ppc64 root=live:LABEL=Adelie-ppc64 rd.live.dir=/ rd.live.squashimg=ppc64.squashfs initrd ($root)/initrd-ppc64 } diff --git a/image/iso-share/post-x86_64.sh b/image/iso-share/post-x86_64.sh index 5594a13..e8b904d 100755 --- a/image/iso-share/post-x86_64.sh +++ b/image/iso-share/post-x86_64.sh @@ -3,7 +3,7 @@ mkdir -p cdroot/boot cat >early.cfg <<'EARLYCFG' -search.fs_label "Adelie x86_64" root +search.fs_label "Adelie-x86_64" root set prefix=($root)/boot EARLYCFG @@ -11,8 +11,8 @@ cat >cdroot/boot/grub.cfg <<'GRUBCFG' menuentry "Adelie Linux Live (Intel 64-bit)" --class linux --id adelie-live-cd { insmod iso9660 insmod linux - search --label "Adelie x86_64" --no-floppy --set - linux ($root)/kernel-x86_64 squashroot=x86_64.squashfs + 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 initrd ($root)/initrd-x86_64 } -- cgit v1.2.3-60-g2f50