[Devil-linux-commit] build/scripts/scripts install-on-usb, 1.22, 1.23

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv24922

Modified Files:
	install-on-usb 
Log Message:

- don't try to preserve permissions for vfat


Index: install-on-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- install-on-usb	30 Sep 2005 00:52:46 -0000	1.22
+++ install-on-usb	11 Apr 2008 12:14:53 -0000	1.23
@@ -40,7 +40,10 @@
 		return 0
 	elif [ -f "$1" ]; then
 		echo "copying source file $1 to device mounted on $2"
-		nice cp -p $1 $2 || return 1
+		if [ x"$3" != x"not_save_permissions" ] ; then 
+			PRESERVE="-p"
+		fi
+		nice cp $PRESERVE $1 $2 || return 1
 		return 0
 	else
 		echo "$1 is not a valid source for the ISO"
@@ -356,7 +359,7 @@
 		cp $TMPDIR/iso-mnt/{DEVIL-LINUX,LICENSE} $TMPDIR/disk-mnt/ &> /dev/null || return 1
 		cat $TMPDIR/iso-mnt/isolinux.cfg | sed -e s%"/boot/"%""% > $TMPDIR/disk-mnt/syslinux.cfg || return 1
 		cat $TMPDIR/iso-mnt/boot/message | sed -e s%"/boot/"%""% > $TMPDIR/disk-mnt/message || return 1
-		copy_iso_file $DLISO $TMPDIR/disk-mnt/bootcd.iso || return 1	
+		copy_iso_file $DLISO $TMPDIR/disk-mnt/bootcd.iso not_save_permissions || return 1	
 
 	elif [ "$BOOTLOADER" = "grub" ] || [ "$BOOTLOADER" = "lilo" ]; then