From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 949C5158004 for ; Mon, 13 May 2024 14:59:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B672AE2ABA; Mon, 13 May 2024 14:59:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0657EE2ABA for ; Mon, 13 May 2024 14:59:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E85A633BDE1 for ; Mon, 13 May 2024 14:59:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 772A51799 for ; Mon, 13 May 2024 14:59:13 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1715611922.eff4b31ba42d96ab2cb29195455c63b3321c0835.bkohler@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/bootloader-setup.sh X-VCS-Directories: targets/support/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: eff4b31ba42d96ab2cb29195455c63b3321c0835 X-VCS-Branch: master Date: Mon, 13 May 2024 14:59:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cbc740f7-20cb-421a-a53a-9b22927524f0 X-Archives-Hash: aeb7b1880b2693e3fe4bd30117db441c commit: eff4b31ba42d96ab2cb29195455c63b3321c0835 Author: Ben Kohler gentoo org> AuthorDate: Mon May 13 14:52:02 2024 +0000 Commit: Ben Kohler gentoo 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 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}