diff options
| author |   Ben Kohler <bkohler@gentoo.org> | 2024-05-13 09:52:02 -0500 |
|---|---|---|
| committer | Ben Kohler <bkohler@gentoo.org> | 2024-05-13 09:52:02 -0500 |
| commit | eff4b31ba42d96ab2cb29195455c63b3321c0835 (patch) | |
| tree | af119d96432c787abd17996d29873cd17ea4426c | |
| parent | create-iso.sh: restore ISO volume ID (diff) | |
| download | catalyst-eff4b31ba42d96ab2cb29195455c63b3321c0835.tar.gz catalyst-eff4b31ba42d96ab2cb29195455c63b3321c0835.tar.bz2 catalyst-eff4b31ba42d96ab2cb29195455c63b3321c0835.zip | |
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@gentoo.org>
| -rwxr-xr-x | targets/support/bootloader-setup.sh | 4 |
1 files 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} |