Really fixing bug #120475 this time. This is 2.0_rc25.

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

diff --git a/ChangeLog b/ChangeLog
index 5efb0cd0f1dfd9fe6aa754a3db0acb0333090fe7..acc7543a73b386817add2621757dd17dbebb4e46 100644 (file)
--- 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.533 2006/01/26 23:17:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.534 2006/01/26 23:39:26 wolf31o2 Exp $
+
+  26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/create-iso.sh:
+  Really fixing bug #120475 this time.  This is 2.0_rc25.
 
   26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/support/create-iso.sh:

diff --git a/catalyst b/catalyst
index 1ed35c0641e0b21700e927feeeb2d19007c591d7..c74985e72113169917110b6032fb31470efd29ba 100755 (executable)
--- 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.132 2006/01/26 23:17:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.133 2006/01/26 23:39:26 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_rc24"
+__version__="2.0_rc25"
 
 conf_values={}
 

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index b06243b84c5918f45e38c6717bae461271195044..e6a4ebda5ffe477954902b6f379a03007c0d8496 100755 (executable)
--- 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.23 2006/01/26 23:17:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.24 2006/01/26 23:39:26 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
@@ -210,14 +210,14 @@ case ${clst_mainarch} in
                        *)
                                echo "Running mkisofs to create iso image...."
                                echo "mkisofs -J -r -l -chrp-boot -netatalk -hfs -probe -map \
-                                       ${clst_target_path}/boot/map.hfs -part -no-desktop \
+                                       ${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 \
+                                       ${clst_target_path}boot -V \"${clst_iso_volume_id}\" -o \
                                        ${1} ${clst_target_path}"
                                mkisofs -J -r -l -chrp-boot -netatalk -hfs -probe -map \
-                                       ${clst_target_path}/boot/map.hfs -part -no-desktop \
+                                       ${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 \
+                                       ${clst_target_path}boot -V "${clst_iso_volume_id}" -o \
                                        ${1} ${clst_target_path} || die "Cannot make ISO image"
                        ;;
                esac