[Devil-linux-commit] build/scripts ipsec-tools,1.3,1.4 functions,1.52,1.53

[Bruce S. <bl...@us...>]

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

Modified Files:
	ipsec-tools functions 
Log Message:
Verbose mode in copy_files, and fixes to ipsec from Oliver.


Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- functions	1 Feb 2004 15:04:23 -0000	1.52
+++ functions	16 Mar 2004 15:29:13 -0000	1.53
@@ -64,7 +64,7 @@
 {
 	for FILE in $1
 	do
-		cp -dpfR $FILE $2
+		cp -dvpfR $FILE $2
 	done
 }
 
@@ -77,7 +77,7 @@
 	for FILE in $1
 	do
 		mkdir -p $2
-		cp -dupR $FILE $2
+		cp -dvupR $FILE $2
 		if [ -L "$FILE" ]; then
 			LINK=$(read_link $FILE)
 			LINKTARGET=${FILE%/*}/$LINK

Index: ipsec-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ipsec-tools,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ipsec-tools	11 Mar 2004 01:47:28 -0000	1.3
+++ ipsec-tools	16 Mar 2004 15:29:13 -0000	1.4
@@ -64,10 +64,10 @@
 	chmod +x $setkeycfg
 	chmod +x $setkeyreset
   	copy_files $TMPDIR/etc $ETCDIR
-  	copy_files $TMPDIR/usr $CDDIR/usr
+  	copy_files $TMPDIR/usr/sbin $CDDIR/usr/
 	cp -p $MYDIR/scripts/ipsec-tools $ETCDIR/etc/init.d || exit 1
 	chmod +x $ETCDIR/etc/init.d/ipsec-tools
-	rm -rf $TMPDIR
+	rm -rf $TMPDIR 2>/dev/null
     	;;
 
     * )