[Pkg-sysvinit-commits] r520 - sysvinit/trunk/debian/initscripts

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-04 14:47:37 +0000 (Wed, 04 Jan 2006)
New Revision: 520

Modified:
   sysvinit/trunk/debian/initscripts/postinst
Log:
postinst: Set default default default default variables; generate variable assignments with quotation marks

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-01-04 10:41:58 UTC (rev 519)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-01-04 14:47:37 UTC (rev 520)
@@ -80,23 +80,30 @@
 	# using current value set for each variable
 	#
 	(
+		TMPTIME=""
+		SULOGIN=""
+		DELAYLOGIN=""
+		UTC=""
+		VERBOSE=""
+		EDITMOTD=""
+		FSCKFIX=""
 		. /usr/share/initscripts/default.rcS >/dev/null 2>&1
 		. /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/" \
+			-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-new
-		if diff -q /etc/default/rcS /etc/default/rcS.dpkg-new >/dev/null
+			> /etc/default/rcS.dpkg-tmp
+		if diff -q /etc/default/rcS /etc/default/rcS.dpkg-tmp >/dev/null
 		then
-			rm -f /etc/default/rcS.dpkg-new
+			rm -f /etc/default/rcS.dpkg-tmp
 		else
-			mv -f /etc/default/rcS.dpkg-new /etc/default/rcS
+			mv -f /etc/default/rcS.dpkg-tmp /etc/default/rcS
 		fi
 	)
 fi