[Pkg-sysvinit-commits] r541 - in sysvinit/trunk/debian: . initscripts

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-06 14:17:04 +0000 (Fri, 06 Jan 2006)
New Revision: 541

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/postinst
Log:
Don't regenerate /etc/default/rcS because it appears that some systems have more or fewer settings in that file than just the seven that are there by default; preserving the presence or absence of assignments, as well as the values assigned, is difficult to implement correctly

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-06 14:09:33 UTC (rev 540)
+++ sysvinit/trunk/debian/changelog	2006-01-06 14:17:04 UTC (rev 541)
@@ -37,8 +37,6 @@
     oldstable
   * initscripts postinst: Remove obsolete GMT-to-UTC code: this
     conversion was performed when systems were upgraded to potato
-  * initscripts postinst: Regenerate /etc/default/rcS so that comments
-    are updated
   * sysvinit: Depend on libc6 rather than Pre-Depending on it; we don't
     do anything special in the preinsts any more
   * Correct documentation of init's -e and -t options

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-01-06 14:09:33 UTC (rev 540)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-01-06 14:17:04 UTC (rev 541)
@@ -74,44 +74,6 @@
 	# Install default rcS default file.
 	#
 	cp -p /usr/share/initscripts/default.rcS /etc/default/rcS
-else
-	#
-	# Generate rcS default file from default rcS default file
-	# using current value set for each variable
-	#
-	# Run in sub-shell so that variable assignments are local
-	(
-		#
-		# If there were more variables then a loop would be better
-		#
-		TMPTIME=""
-		SULOGIN=""
-		DELAYLOGIN=""
-		UTC=""
-		VERBOSE=""
-		EDITMOTD=""
-		FSCKFIX=""
-		. /usr/share/initscripts/default.rcS >/dev/null 2>&1
-		[ -f /etc/default/rcS ] && . /etc/default/rcS >/dev/null 2>&1
-		sed \
-			-e 's/^[[:space:]]*TMPTIME[[:space:]]*=.*/TMPTIME="'"$TMPTIME"'"/' \
-			-e 's/^[[:space:]]*SULOGIN[[:space:]]*=.*/SULOGIN="'"$SULOGIN"'"/' \
-			-e 's/^[[:space:]]*DELAYLOGIN[[:space:]]*=.*/DELAYLOGIN="'"$DELAYLOGIN"'"/' \
-			-e 's/^[[:space:]]*UTC[[:space:]]*=.*/UTC="'"$UTC"'"/' \
-			-e 's/^[[:space:]]*VERBOSE[[:space:]]*=.*/VERBOSE="'"$VERBOSE"'"/' \
-			-e 's/^[[:space:]]*EDITMOTD[[:space:]]*=.*/EDITMOTD="'"$EDITMOTD"'"/' \
-			-e 's/^[[:space:]]*FSCKFIX[[:space:]]*=.*/FSCKFIX="'"$FSCKFIX"'"/' \
-			< /usr/share/initscripts/default.rcS \
-			> /etc/default/rcS.dpkg-tmp
-		if [ -f /etc/default/rcS ] && diff -q /etc/default/rcS /etc/default/rcS.dpkg-tmp >/dev/null
-		then
-			rm -f /etc/default/rcS.dpkg-tmp
-		else
-			[ -f /etc/default/rcS ] && cp -p /etc/default/rcS /etc/default/rcS.dpkg-old
-			cp -p /etc/default/rcS.dpkg-tmp /etc/default/rcS
-			rm -f /etc/default/rcS.dpkg-tmp
-		fi
-	)
 fi
 
 #