From bacc2697d77db247236389e2336cdb9b23dc426d Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 22 Nov 2005 15:37:03 +0000 Subject: [PATCH] Fixed a few lines which were causing the isolinux directory to be removed when using an isolinux cdtar on x86/amd64. This is 2.0_pre20051122. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@906 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- catalyst | 4 ++-- targets/support/create-iso.sh | 13 ++++++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d70a9a98..5529f2f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.393 2005/11/21 23:16:41 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.394 2005/11/22 15:37:03 wolf31o2 Exp $ + + 22 Nov 2005; Chris Gianelloni catalyst, + targets/support/create-iso.sh: + Fixed a few lines which were causing the isolinux directory to be removed + when using an isolinux cdtar on x86/amd64. This is 2.0_pre20051122. 21 Nov 2005; Chris Gianelloni targets/support/create-iso.sh: diff --git a/catalyst b/catalyst index ee00509f..a7692d2d 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,7 @@ #!/usr/bin/python # 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.99 2005/11/18 15:39:32 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.100 2005/11/22 15:37:03 wolf31o2 Exp $ # Maintained in full by: # Eric Edgar @@ -10,7 +10,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0_pre20051118" +__version__="2.0_pre20051122" conf_values={} diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 01348f4c..7f82967a 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -1,6 +1,6 @@ # 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.16 2005/11/21 23:16:41 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.17 2005/11/22 15:37:03 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -176,12 +176,15 @@ case ${clst_mainarch} in if [ -e ${clst_target_path}/isolinux/isolinux.bin ] then echo "Creating ISO using ISOLINUX bootloader" - if [ -d ${clst_target_path}/isolinux ] + if [ -d ${clst_target_path}/boot ] then - rm -r ${clst_target_path}/isolinux + if [ -n "$(ls ${clst_target_path}/boot)" ] + then + mv ${clst_target_path}/boot/* ${clst_target_path}/isolinux + fi + rm -r ${clst_target_path}/boot fi - mv ${clst_target_path}/boot ${clst_target_path}/isolinux - + 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}" -- 2.26.2