From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Tue, 31 Jan 2006 14:59:15 +0000 (+0000)
Subject: Added fix for amd64/x86 ISO creation.  This is 2.0_rc28.
X-Git-Tag: CATALYST_2_0_6_916~435
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=228756e18668cdd842b42883060c319c6079fff4;p=catalyst.git

Added fix for amd64/x86 ISO creation.  This is 2.0_rc28.


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

diff --git a/ChangeLog b/ChangeLog
index 795ca3ad..daceab28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.544 2006/01/30 14:21:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.545 2006/01/31 14:59:14 wolf31o2 Exp $
+
+  31 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/create-iso.sh:
+  Added fix for amd64/x86 ISO creation.  This is 2.0_rc28.
 
   30 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/bootloader-setup.sh:
diff --git a/catalyst b/catalyst
index 53e18987..47d891ac 100755
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.135 2006/01/29 08:32:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.136 2006/01/31 14:59:15 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc27"
+__version__="2.0_rc28"
 
 conf_values={}
 
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index ace8c198..c38b8a25 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 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.26 2006/01/27 22:57:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.27 2006/01/31 14:59:15 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
@@ -226,8 +226,12 @@ case ${clst_mainarch} in
 		if [ -f ${clst_target_path}/ppc/bootinfo.txt ]
 		then
 			echo "bootinfo.txt found .. updating it"
-			sed -i ${clst_target_path}/ppc/bootinfo.txt -e 's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#'
-			sed -i ${clst_target_path}/ppc/bootinfo.txt -e 's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#'
+			sed -i -e \
+			's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#' \
+			${clst_target_path}/ppc/bootinfo.txt
+			sed -i -e \
+			's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \
+			${clst_target_path}/ppc/bootinfo.txt
 		fi
 
 		case ${clst_livecd_cdfstype} in
@@ -307,18 +311,21 @@ case ${clst_mainarch} in
 				mount -t vfat -o loop ${clst_target_path}/gentoo.efimg \
 					${clst_target_path}/gentoo.efimg.mountPoint
 
-				echo '>> Populating EFI image...'
+				echo "Populating EFI image"
 				cp -pPRv ${clst_target_path}/boot/* \
 					${clst_target_path}/gentoo.efimg.mountPoint
 
 				umount ${clst_target_path}/gentoo.efimg.mountPoint
 				rmdir ${clst_target_path}/gentoo.efimg.mountPoint
 			else
-				echo ">> Found populated EFI image at \
+				echo "Found populated EFI image at \
 					${clst_target_path}/gentoo.efimg"
 			fi
-			echo '>> Removing /boot...'
-			rm -rf ${clst_target_path}/boot
+			if [ ! -e ${clst_target_path}/boot/grub/stage2_eltorito ]
+			then
+				echo "Removing /boot"
+				rm -rf ${clst_target_path}/boot
+			fi
 		fi
 
 		if [ -e ${clst_target_path}/isolinux/isolinux.bin ]
@@ -396,6 +403,36 @@ case ${clst_mainarch} in
 						;;
 					esac
 				fi
+			else
+				echo "Creating ISO using ISOLINUX bootloader"
+				case ${clst_fstype} in
+					zisofs)
+						echo "mkisofs -J -R -l -V \
+							\"${clst_iso_volume_id}\" -o ${1} -b \
+							isolinux/isolinux.bin -c isolinux/boot.cat \
+							-no-emul-boot -boot-load-size 4 \
+							-boot-info-table -z ${clst_target_path}"
+						mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \
+							${1} -b isolinux/isolinux.bin -c \
+							isolinux/boot.cat -no-emul-boot \
+							-boot-load-size 4 -boot-info-table -z \
+							${clst_target_path} \
+							|| die "Cannot make ISO image"
+					;;
+					*)
+						echo "mkisofs -J -R -l -V \
+							\"${clst_iso_volume_id}\" -o ${1} -b \
+							isolinux/isolinux.bin -c isolinux/boot.cat \
+							-no-emul-boot -boot-load-size 4 \
+							-boot-info-table ${clst_target_path}"
+						mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \
+							${1} -b isolinux/isolinux.bin -c \
+							isolinux/boot.cat -no-emul-boot \
+							-boot-load-size 4 -boot-info-table \
+							${clst_target_path} \
+							|| die "Cannot make ISO image"
+					;;
+				esac
 			fi
 		elif [ -e ${clst_target_path}/boot/grub/stage2_eltorito ]
 		then