Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10958/scripts/scripts
Modified Files:
upgrade-config
Log Message:
- upgrade-config now removes old file redirections from modules.conf
Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- upgrade-config 30 Dec 2003 18:44:50 -0000 1.12
+++ upgrade-config 26 Jan 2004 18:15:08 -0000 1.13
@@ -188,8 +188,13 @@
chmod --reference /$d newconfig/$d
chown --reference /$d newconfig/$d
fi
- echo "keeping file: $p" | tee -a $LOGF
- cp -af $p newconfig/$p
+ if [ "$p" = "etc/modules.conf" ]; then
+ echo "migrating file: $p" | tee -a $LOGF
+ grep -v "file=/" $p > newconfig/$p
+ else
+ echo "keeping file: $p" | tee -a $LOGF
+ cp -af $p newconfig/$p
+ fi
done
echo >> $LOGF
@@ -246,7 +251,7 @@
# Migrate passwords for existing users/groups
while read id ; do
name="$(echo $id|cut -d: -f1)"
- if [ $(grep -c "^${name}:" ${2}) -ne 1 ]; then
+ if [ $(grep -c "^${name}:" ${2}) -ne 1 ]; then
grep "^${name}:" newconfig/${2}- >> newconfig/${2}
else
grep "^${name}:" ${2} >> newconfig/${2}
|
