tools/livecd-iso-to-disk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit e63eb0d5e739b68568837c15bfb3f791c284db7d Author: Brian C. Lane <[email protected]> Date: Mon Apr 16 15:28:07 2012 -0700 skip copying DVD image file with skipcopy option (786037) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 8f8f6c4..f428812 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -615,7 +615,7 @@ checkFilesystem() { TGTFS=$(/sbin/blkid -s TYPE -o value $dev || :) if [ "$TGTFS" != "vfat" ] && [ "$TGTFS" != "msdos" ]; then if [ "$TGTFS" != "ext2" ] && [ "$TGTFS" != "ext3" ] && [ "$TGTFS" != "ext4" ] && [ "$TGTFS" != "btrfs" ]; then - echo "Target filesystem must be vfat, ext[234] or btrfs" + echo "Target filesystem ($dev:$TGTFS) must be vfat, ext[234] or btrfs" exitclean fi fi @@ -1145,7 +1145,7 @@ fi # DVD installer copy # Also copies over the source .iso if the image is a new-style LiveOS DVD (F17+) -if [ \( "$srctype" = "installer" -o "$srctype" = "netinst" \) ]; then +if [ -z "$skipcopy" -a \( "$srctype" = "installer" -o "$srctype" = "netinst" \) ]; then echo "Copying DVD image to target device." mkdir -p $TGTMNT/images/ if [ "$imgtype" = "install" ]; then -- livecd mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/livecd
