Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv15161/scripts/scripts
Modified Files:
Tag: rel-1-0-patches
upgrade-config
Log Message:
- increased version number
- upgrade-config now correctly handles symlinks
Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- upgrade-config 5 Nov 2003 15:57:44 -0000 1.6.2.1
+++ upgrade-config 23 Dec 2003 17:17:39 -0000 1.6.2.2
@@ -104,6 +104,7 @@
[ $f = "etc/sysconfig/config.old" ] && continue
[ $f = "etc/sysconfig/upgrade.log" ] && continue
[ $f = "etc/sysconfig/software" ] && continue
+ [ $f = "etc/modules/modules.dep" ] && continue
[ $f = "etc/mtab" ] && continue
[ $f = "etc/.pwd.lock" ] && continue
cmp -s $f newconfig/$f || echo $f \"\" off \"$f\" >> $TMPD
@@ -162,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
|
