Fixed a few lines which were causing the isolinux directory to be removed when using...

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

diff --git a/ChangeLog b/ChangeLog
index d70a9a982df0b167ef652b99477e09d4e9f44956..5529f2f7a70970552fe074d7ebd617b1ce011ff2 100644 (file)
--- 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 <wolf31o2@gentoo.org> 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 <wolf31o2@gentoo.org>
   targets/support/create-iso.sh:

diff --git a/catalyst b/catalyst
index ee00509fc6e73567837be4434eea24b01d3f51d8..a7692d2d34a66c6987243127c64c6f669cbaebf0 100755 (executable)
--- 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 <rocket@gentoo.org>
@@ -10,7 +10,7 @@
 import os,sys,imp,string,getopt
 import pdb
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__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 01348f4c60970c66a5f572c3479a11c4b75501b5..7f82967afa6ee1a5228ce72283f60706c6b8eefa 100755 (executable)
--- 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}"