[Devil-linux-commit] build/scripts/scripts upgrade-config,1.9,1.10

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv6332/scripts/scripts

Modified Files:
	upgrade-config 
Log Message:
- upgrade-config now correctly sets directory permissions and owner/group


Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- upgrade-config	26 Dec 2003 19:39:26 -0000	1.9
+++ upgrade-config	26 Dec 2003 19:49:35 -0000	1.10
@@ -174,11 +174,11 @@
 		for f in $(cat $RESULT)
 		do
 			eval p=$f
-			d="$(dirname newconfig/$p)"
-			if [ ! -d $d ]; then
-				mkdir -p $d
-				chmod --reference /$d $d
-				chown --reference /$d $d
+			d="$(dirname $p)"
+			if [ ! -d newconfig/$d ]; then
+				mkdir -p newconfig/$d
+				chmod --reference /$d newconfig/$d
+				chown --reference /$d newconfig/$d
 			fi
 			echo "keeping file:  $p" | tee -a $LOGF
 			cp -af $p newconfig/$p
@@ -190,11 +190,12 @@
 		echo >> $LOGF
 		for f in $(find /etc/ -type l | grep -v "init.d/rc")
 		do
-			d="$(dirname newconfig/$p)"
-			if [ ! -d $d ]; then
-				mkdir -p $d
-				chmod --reference /$d $d
-				chown --reference /$d $d
+			eval p=$f
+			d="$(dirname $p)"
+			if [ ! -d newconfig/$d ]; then
+				mkdir -p newconfig/$d
+				chmod --reference /$d newconfig/$d
+				chown --reference /$d newconfig/$d
 			fi
 			echo "preserving link:  $f" | tee -a $LOGF
 			cp -dpf $f newconfig/$f