From c8e713620a4011c5bf592b6de4383a6d8100d21f Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Wed, 1 Jun 2005 13:41:12 +0000
Subject: [PATCH] General cleanup of ISO code and added default livecd/volid
 when it is not set.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@667 d1e1f19c-881f-0410-ab34-b69fee027534
---
 ChangeLog                     |  6 ++-
 targets/support/create-iso.sh | 86 +++++++++++++++++++++++++----------
 2 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e8cdd5e..37f83ac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.264 2005/05/25 19:28:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.265 2005/06/01 13:41:12 wolf31o2 Exp $
+
+  01 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/create-iso.sh:
+  General cleanup of ISO code and added default livecd/volid when it is not set.
 
   25 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/embedded/embedded-controller.sh:
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index dafca96a..3e24bdba 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.3 2005/04/29 13:32:51 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.4 2005/06/01 13:41:12 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 #. ${clst_sharedir}/targets/${clst_target}/${clst_mainarch}-archscript.sh
@@ -17,10 +17,61 @@ then
 	echo
 fi
 
+# If not volume ID is set, make up a sensible default
+if [ -z "${clst_iso_volume_id}" ]
+then
+	case ${clst_livecd_type} in
+		gentoo-*)
+			case ${clst_mainarch} in
+				alpha)
+					clst_iso_volume_id="Gentoo Linux - Alpha"
+				;;
+				amd64)
+					clst_iso_volume_id="Gentoo Linux - AMD64"
+				;;
+				arm)
+					clst_iso_volume_id="Gentoo Linux - ARM"
+				;;
+				hppa)
+					clst_iso_volume_id="Gentoo Linux - HPPA"
+				;;
+				ia64)
+					clst_iso_volume_id="Gentoo Linux - IA64"
+				;;
+				m68k)
+					clst_iso_volume_id="Gentoo Linux - M68K"
+				;;
+				mips)
+					clst_iso_volume_id="Gentoo Linux - MIPS"
+				;;
+				ppc)
+					clst_iso_volume_id="Gentoo Linux - PPC"
+				;;
+				ppc64)
+					clst_iso_volume_id="Gentoo Linux - PPC64"
+				;;
+				s390)
+					clst_iso_volume_id="Gentoo Linux - S390"
+				;;
+				sh)
+					clst_iso_volume_id="Gentoo Linux - SH"
+				;;
+				sparc)
+					clst_iso_volume_id="Gentoo Linux - SPARC"
+				;;
+				x86)
+					clst_iso_volume_id="Gentoo Linux - X86"
+				;;
+			esac
+		*)
+			clst_iso_volume_id="Catalyst LiveCD"
+		;;
+	esac
+fi
+
+# Here we actually create the ISO images for each architecture
 case ${clst_mainarch} in
 	alpha)
-		# this is for the livecd-final target, and calls the proper
-		# command to build the iso file
 		case ${clst_fstype} in
 			zisofs)
 				mkisofs -J -R -l -z -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path}  || die "Cannot make ISO image"
@@ -31,28 +82,18 @@ case ${clst_mainarch} in
 		esac
 		isomarkboot ${1} /boot/bootlx
 	;;
-
 	arm)
-		;;
-	hppa)
-                #this is for the livecd-stage2 target, and calls the proper command to build the iso file
-	        mkisofs -J -R -l -V "${clst_iso_volume_id}" -o  ${1} ${clst_target_path}  || die "Cannot make ISO image"
-	        palo -f boot/palo.conf -C ${1}
-
 	;;
-	ppc)
-		# The name of the iso should be retrieved from the specs. For now, asssume GentooPPC_2004.0
-		mkisofs -J -r -l -netatalk -hfs -probe -map ${clst_target_path}/boot/map.hfs -part -no-desktop -hfs-iso_volume_id \
-			"${clst_iso_volume_id}" -hfs-bless ${clst_target_path}/boot -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path}
+	hppa)
+		mkisofs -J -R -l -V "${clst_iso_volume_id}" -o  ${1} ${clst_target_path}  || die "Cannot make ISO image"
+		palo -f boot/palo.conf -C ${1}
 	;;
-	sparc)
-		# this is for the livecd-final target, and calls the proper
-		# command to build the iso file
-		mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -G ${clst_target_path}/boot/isofs.b -B ... ${clst_target_path} \
+	ppc*)
+		mkisofs -J -r -l -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 -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} \
 			|| die "Cannot make ISO image"
-
 	;;
-	sparc64)
+	sparc)
 		# Old silo + patched mkisofs fubar magic
 		# Only silo 1.2.x seems to work for most hardware
 		# Seems silo 1.3.x+ breaks on newer machines
@@ -66,10 +107,7 @@ case ${clst_mainarch} in
 															
 	;;
 	
-	x86)
-		#this is for the livecd-stage2 target, and calls the proper command
-		# to build the iso file
-		#
+	x86|amd64)
 		if [ -e ${clst_target_path}/boot/isolinux.bin ]
 		then
 			echo "Creating ISO using ISOLINUX bootloader"
-- 
2.26.2