[Devil-linux-commit] build/scripts/scripts upgrade-config,1.6.2.2,1.6.2.3

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

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

Modified Files:
      Tag: rel-1-0-patches
	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.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- upgrade-config	23 Dec 2003 17:17:39 -0000	1.6.2.2
+++ upgrade-config	26 Dec 2003 19:51:46 -0000	1.6.2.3
@@ -174,9 +174,12 @@
 		for f in $(cat $RESULT)
 		do
 			eval p=$f
-			d="$(dirname newconfig/$p)"
-			[ ! -d $d ] && mkdir -p $d
-			# echo cp -af $p newconfig/$p
+			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
 		done
@@ -187,8 +190,13 @@
 		echo >> $LOGF
 		for f in $(find /etc/ -type l | grep -v "init.d/rc")
 		do
-			d="$(dirname newconfig/$p)"
-			[ ! -d $d ] && mkdir -p $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
 		done