From f6ecc4e6985571e105109a10cd8acac06843b94b Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 26 Jan 2006 23:39:26 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 +++++- catalyst | 4 ++-- targets/support/create-iso.sh | 10 +++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5efb0cd0..acc7543a 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.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 catalyst, + targets/support/create-iso.sh: + Really fixing bug #120475 this time. This is 2.0_rc25. 26 Jan 2006; Chris Gianelloni catalyst, targets/support/create-iso.sh: diff --git a/catalyst b/catalyst index 1ed35c06..c74985e7 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.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 @@ -11,7 +11,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 b06243b8..e6a4ebda 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.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 -- 2.26.2