[Devil-linux-commit] build/scripts/scripts upgrade-config,1.19,1.20

[Bruce S. <bl...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6567/scripts/scripts

Modified Files:
	upgrade-config 
Log Message:
Do not select init.d files (except for firewall.rules*) by default.


Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- upgrade-config	23 Apr 2004 15:33:04 -0000	1.19
+++ upgrade-config	23 Apr 2004 18:33:57 -0000	1.20
@@ -69,6 +69,10 @@
     [ $height -gt $linecount ] && height=$linecount
 }
 
+comparesubstr () {
+	[ "$(expr substr "$1" 1 $(expr length "$2"))" = "$2" ] && return 0 || return 1
+}
+
 echo
 if [ -e $RAMDISKDIR/newconfig ]; then
 	echo /shm/newconfig exists, please remove.
@@ -112,9 +116,11 @@
 	[ $f = "etc/shadow-" ] && continue
 	[ $f = "etc/gshadow" ] && continue
 	[ $f = "etc/gshadow-" ] && continue
-	[ "$(expr substr "$f" 1 12)" = "etc/modules/" ] && continue
-	[ "$(expr substr "$f" 1 20)" = "etc/sysconfig/config" ] && continue
-	[ "$(expr substr "$f" 1 17)" = "etc/ssh/ssh_host_" ] && onoff="on"
+	comparesubstr "$f" "etc/modules/" && continue
+	comparesubstr "$f" "etc/sysconfig/config" continue
+#	comparesubstr "$f" "etc/ssh/ssh_host_" && onoff="on"
+	comparesubstr "$f" "etc/init.d/" && onoff="off"
+	comparesubstr "$f" "etc/init.d/firewall.rules" && onoff="on"
 	finfo=$(ls -la $f)
 	cmp -s $f newconfig/$f || echo $f \"\" $onoff \"$finfo\" >> $TMPD
 done