[Devil-linux-commit] build/scripts/scripts upgrade-config,1.7,1.8

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

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

Modified Files:
	upgrade-config 
Log Message:
upgrade-config now correctly handles symlinks


Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- upgrade-config	18 Dec 2003 02:38:21 -0000	1.7
+++ upgrade-config	23 Dec 2003 17:12:50 -0000	1.8
@@ -8,7 +8,7 @@
 # http://www.devil-linux.org
 #
 # Written by:  Bruce Smith <dev...@re...>
- 
+
 TMPC=/shm/var/tmp/upd-config.$$
 TMPD=/shm/var/tmp/upd-etc.$$
 TMPF=/shm/var/tmp/upd-tmp.$$
@@ -163,24 +163,37 @@
 		fi
 	    done
 	else
-	# OK button pressed
-	    echo >> $LOGF
-	    echo "************************************************************" >> $LOGF
-	    date >> $LOGF
-	    echo >> $LOGF
-	    echo "Files saved from old config:" >> $LOGF
-	    echo "----------------------------" >> $LOGF
-	    echo >> $LOGF
-	    for f in $(cat $RESULT)
-	    do
-		eval p=$f
-		d="$(dirname newconfig/$p)"
-		[ ! -d $d ] && mkdir -p $d
-		# echo cp -af $p newconfig/$p
-		echo "keeping file:  $p" | tee -a $LOGF
-		cp -af $p newconfig/$p
-	    done
-	    break
+		# OK button pressed
+		echo >> $LOGF
+		echo "************************************************************" >> $LOGF
+		date >> $LOGF
+		echo >> $LOGF
+		echo "Files saved from old config:" >> $LOGF
+		echo "----------------------------" >> $LOGF
+		echo >> $LOGF
+		for f in $(cat $RESULT)
+		do
+			eval p=$f
+			d="$(dirname newconfig/$p)"
+			[ ! -d $d ] && mkdir -p $d
+			# echo cp -af $p newconfig/$p
+			echo "keeping file:  $p" | tee -a $LOGF
+			cp -af $p newconfig/$p
+		done
+
+		echo >> $LOGF
+		echo "Symlinks preserved from old config:" >> $LOGF
+		echo "-----------------------------------" >> $LOGF
+		echo >> $LOGF
+		for f in $(find /etc/ -type l | grep -v "init.d/rc")
+		do
+			d="$(dirname newconfig/$p)"
+			[ ! -d $d ] && mkdir -p $d
+			echo "preserving link:  $f" | tee -a $LOGF
+			cp -dpf $f newconfig/$f
+		done
+
+		break
 	fi
     else
 	# Cancel button pressed