From: Andrew Gaffney <agaffney@gentoo.org>
Date: Tue, 4 Mar 2008 02:37:23 +0000 (+0000)
Subject: Bash fscking sucks, so we have to compromise on this code reduction solution a bit... 
X-Git-Tag: CATALYST_2_0_6_916~143
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=36a342887522d1618b78395ced755dc4ca59eb4d;p=catalyst.git

Bash fscking sucks, so we have to compromise on this code reduction solution a bit. It's still far better than it was

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1351 d1e1f19c-881f-0410-ab34-b69fee027534
---

diff --git a/ChangeLog b/ChangeLog
index be32c656..58cb8e12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  04 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
+  targets/support/create-iso.sh:
+  Bash fscking sucks, so we have to compromise on this code reduction solution
+  a bit. It's still far better than it was
+
   03 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/create-iso.sh:
   Don't escape quotes when actually running the command
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index b10c744f..83de61a8 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -73,25 +73,25 @@ fi
 
 if [ "${clst_fstype}" == "zisofs" ]
 then
-	mkisofs_opts="-J -z -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+	mkisofs_zisofs_opts="-z"
 else
-	mkisofs_opts="-J -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+	mkisofs_zisofs_opts=""
 fi
 
 # Here we actually create the ISO images for each architecture
 case ${clst_hostarch} in
 	alpha)
 		echo ">> Running mkisofs to create iso image...."
-		echo ">> mkisofs -R -l ${mkisofs_opts}"
-		mkisofs -R -l ${mkisofs_opts} || die "Cannot make ISO image"
+		echo ">> mkisofs -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+		mkisofs -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
 		isomarkboot ${1} /boot/bootlx
 	;;
 	arm)
 	;;
 	hppa)
 		echo ">> Running mkisofs to create iso image...."
-		echo ">> mkisofs -R -l ${mkisofs_opts}"
-		mkisofs -R -l ${mkisofs_opts} || die "Cannot make ISO image"
+		echo ">> mkisofs -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+		mkisofs -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
 		palo -f boot/palo.conf -C ${1}
 	;;
 	ia64)
@@ -123,8 +123,8 @@ case ${clst_hostarch} in
 		rm -rf ${clst_target_path}/boot
 
 		echo ">> Running mkisofs to create iso image...."
-		echo ">> mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot ${mkisofs_opts}"
-		mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot ${mkisofs_opts} || die "Cannot make ISO image"
+		echo ">> mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+		mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
 	;;
 	mips)
 		case ${clst_fstype} in
@@ -196,8 +196,8 @@ case ${clst_hostarch} in
 		fi
 
 		echo ">> Running mkisofs to create iso image...."
-		echo ">> mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless ${clst_target_path}boot -hide-hfs \"zisofs\" -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" ${mkisofs_opts}"
-		mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid "${clst_iso_volume_id}" -hfs-bless ${clst_target_path}boot -hide-hfs "zisofs" -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" ${mkisofs_opts} || die "Cannot make ISO image"
+		echo ">> mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless ${clst_target_path}boot -hide-hfs \"zisofs\" -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+		mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid "${clst_iso_volume_id}" -hfs-bless ${clst_target_path}boot -hide-hfs "zisofs" -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
 	;;
 	sparc*)
 		# Old silo (<=1.2.6) requires a specially built mkisofs