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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-06 14:09:33 +0000 (Fri, 06 Jan 2006)
New Revision: 540

Modified:
   sysvinit/trunk/debian/initscripts/postinst
Log:
Handle absent /etc/default/rcS

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-01-06 11:29:50 UTC (rev 539)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-01-06 14:09:33 UTC (rev 540)
@@ -92,7 +92,7 @@
 		EDITMOTD=""
 		FSCKFIX=""
 		. /usr/share/initscripts/default.rcS >/dev/null 2>&1
-		. /etc/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"'"/' \
@@ -103,11 +103,13 @@
 			-e 's/^[[:space:]]*FSCKFIX[[:space:]]*=.*/FSCKFIX="'"$FSCKFIX"'"/' \
 			< /usr/share/initscripts/default.rcS \
 			> /etc/default/rcS.dpkg-tmp
-		if diff -q /etc/default/rcS /etc/default/rcS.dpkg-tmp >/dev/null
+		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
-			mv -f /etc/default/rcS.dpkg-tmp /etc/default/rcS
+			[ -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