Author: lslezak Date: Fri Nov 9 10:39:39 2007 New Revision: 41903 URL: http://svn.opensuse.org/viewcvs/yast?rev=41903&view=rev Log: - fixed ISO image creation on PPC when the path contained spaces (#335164) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/scripts/y2mkiso Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=41903&r1=41902&r2=41903&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Nov 9 10:39:39 2007 @@ -3,6 +3,8 @@ - install required package createrepo (#331530), install additional packages on PPC +- fixed ISO image creation on PPC when the path contained spaces + (#335164) ------------------------------------------------------------------- Fri Nov 2 11:13:58 CET 2007 - jsuchome@suse.cz Modified: trunk/product-creator/scripts/y2mkiso URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/scripts/y2mkiso?rev=41903&r1=41902&r2=41903&view=diff ============================================================================== --- trunk/product-creator/scripts/y2mkiso (original) +++ trunk/product-creator/scripts/y2mkiso Fri Nov 9 10:39:39 2007 @@ -28,6 +28,8 @@ DEST=$2 BOOT_ARCH=$3 +HFS_BLESS= + function usage() { echo "This script creates an ISO image from an existing directory containing a SuSE source." @@ -212,7 +214,8 @@ # use netatalk and macbinary filename translation # bless a directory named suseboot, mark it bootable echo using suseboot for hfs boot - PARAMS="$PARAMS -part --netatalk --macbin -hfs-bless $SOURCE/suseboot" + PARAMS="$PARAMS -part --netatalk --macbin" + HFS_BLESS="suseboot" FILE_MAPPING="/usr/share/YaST2/data/product-creator/HFS_mapping" if [ -f $FILE_MAPPING ] ; then echo using $FILE_MAPPING for hfs mapping @@ -246,7 +249,8 @@ # use netatalk and macbinary filename translation # bless a directory named suseboot, mark it bootable echo using suseboot for hfs boot - PARAMS="$PARAMS -part --netatalk --macbin -hfs-bless $SOURCE/suseboot" + PARAMS="$PARAMS -part --netatalk --macbin" + HFS_BLESS="suseboot" FILE_MAPPING="/usr/share/YaST2/data/product-creator/HFS_mapping" if [ -f $FILE_MAPPING ] ; then echo using $FILE_MAPPING for hfs mapping @@ -340,13 +344,22 @@ fi fi -set -x -mkisofs \ - -p "$CD_PREPARER" \ - $PUB_OPT "$CD_PUBLISHER" \ - $PARAMS -o "$DEST" $XPARAMS "$SOURCE" -set +x - +if [ -z "$HFS_BLESS" ] ; then + set -x + mkisofs \ + -p "$CD_PREPARER" \ + $PUB_OPT "$CD_PUBLISHER" \ + $PARAMS -o "$DEST" $XPARAMS "$SOURCE" + set +x +else + set -x + mkisofs \ + -p "$CD_PREPARER" \ + $PUB_OPT "$CD_PUBLISHER" \ + -hfs-bless "$SOURCE/$HFS_BLESS" \ + $PARAMS -o "$DEST" $XPARAMS "$SOURCE" + set +x +fi if [ -d "$SOURCE2" ] ; then echo removing $SOURCE2 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org