[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     eff4b31ba42d96ab2cb29195455c63b3321c0835
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 14:52:02 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 13 14:52:02 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=eff4b31b

bootloader_setup.sh: don't assume LABEL=ISOIMAGE

Catalyst now sets a proper volume ID via grub-mkrescue so assuming
ISOIMAGE here is no longer correct.  The volume ID will still need
to be standard-compliant without spaces.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/bootloader-setup.sh 
b/targets/support/bootloader-setup.sh
index 455a4f07..9196ea14 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -54,7 +54,7 @@ memtest_grub() {
 }
 
 default_append_line=(${cmdline_opts[@]} cdroot)
-default_dracut_append_line=(root=live:CDLABEL=ISOIMAGE rd.live.dir=/ 
rd.live.squashimg=image.squashfs)
+default_dracut_append_line=(root=live:CDLABEL=${clst_iso_volume_id} 
rd.live.dir=/ rd.live.squashimg=image.squashfs)
 
 case ${clst_hostarch} in
        alpha)
@@ -121,7 +121,7 @@ case ${clst_hostarch} in
                        echo "menuentry 'Boot LiveCD (kernel: ${x})' --class 
gnu-linux --class os {"  >> ${iacfg}
                        if [ ${distkernel} = "yes" ]
                        then
-                               echo "  search --no-floppy --set=root -l 
'ISOIMAGE'" >> ${iacfg}
+                               echo "  search --no-floppy --set=root -l 
${clst_iso_volume_id}" >> ${iacfg}
                                echo "  linux ${kern_subdir}/${x} 
${default_dracut_append_line[@]}" >> ${iacfg}
                        else
                                echo "  linux ${kern_subdir}/${x} 
${default_append_line[@]}" >> ${iacfg}