Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
Date: Sat, 24 Oct 2020 22:07:54
Message-Id: 1603577221.7e1ea3ac0107c349333d1ec887917eb3627af7a4.mattst88@gentoo
1 commit: 7e1ea3ac0107c349333d1ec887917eb3627af7a4
2 Author: Daniel Cordero <catalyst <AT> 0xdc <DOT> io>
3 AuthorDate: Fri Oct 23 09:18:45 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 24 22:07:01 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7e1ea3ac
7
8 Build ISO with Joliet directory information
9
10 Previous syslinux based CDs had this information.
11 Necessary for direct kernel booting with virt-install --location.
12
13 Fixes: 0a27a7a39a "targets: Use GRUB for BIOS boot"
14 Signed-off-by: Daniel Cordero <catalyst <AT> 0xdc.io>
15 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
16
17 targets/support/create-iso.sh | 5 +++--
18 1 file changed, 3 insertions(+), 2 deletions(-)
19
20 diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
21 index 9b1c7185..a5d5194e 100755
22 --- a/targets/support/create-iso.sh
23 +++ b/targets/support/create-iso.sh
24 @@ -191,12 +191,13 @@ case ${clst_hostarch} in
25 amd64|ia64|ppc*|powerpc*|sparc*|x86)
26 isoroot_checksum
27
28 + extra_opts=("-joliet")
29 case ${clst_hostarch} in
30 - sparc*) extra_opts="--sparc-boot" ;;
31 + sparc*) extra_opts+=("--sparc-boot") ;;
32 esac
33
34 echo ">> Running grub-mkrescue to create iso image...."
35 - grub-mkrescue ${extra_opts} -o "${1}" "${clst_target_path}"
36 + grub-mkrescue "${extra_opts[*]}" -o "${1}" "${clst_target_path}"
37 ;;
38 esac
39 exit $?