[Devil-linux-commit] build/scripts/scripts pre_init, 1.29, 1.30 upgrade-config, 1.32, 1.33

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

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

Modified Files:
	pre_init upgrade-config 
Log Message:
Fixed setting file permissions on boot to not confict with aufs.


Index: pre_init
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/pre_init,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- pre_init	16 Apr 2008 13:19:16 -0000	1.29
+++ pre_init	18 Apr 2008 12:47:07 -0000	1.30
@@ -84,7 +84,6 @@
 
 if ! cmp -s /shm/etc/Devil-release /etc-cd/Devil-release
 then
-	cp -f /etc-cd/issue* /etc
 	RV1="$(cat /shm/etc/Devil-release | sed 's/Devil-Linux //')"
 	RV2="$(cat /etc-cd/Devil-release | sed 's/Devil-Linux //')"
 	echo
@@ -99,6 +98,7 @@
 	echo "Your cdrom is version:  $RV2"
 	$NORMAL
 	echo
+	cp -f /etc-cd/{Devil-release,issue,issue.net} /shm/etc/
 	bs="n"
 	read -n 1 -t 300 -p 'Press any key to upgrade, or "n" to skip.  (timeout in 5 minutes)' bs
 	echo

Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- upgrade-config	16 Apr 2008 13:19:16 -0000	1.32
+++ upgrade-config	18 Apr 2008 12:47:07 -0000	1.33
@@ -224,7 +224,6 @@
 				fi
 			done
 		fi
-		cp -f /etc-cd/{Devil-release,issue,issue.net} /shm/etc/
 
 #		echo >> $LOGF
 #		echo "Symlinks preserved from old config:" >> $LOGF