[Initscripts-ng-commits] r540 - in /trunk/src/insserv/debian: changelog insserv.config

[pere at users.alioth.debian.org]

Author: pere
Date: Thu Jan 17 10:01:26 2008
New Revision: 540

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=540
Log:
  * Allow insserv to be enabled by preseeding by not updating the
    debconf template default from disk in insserv.config unless
    /usr/sbin/update-rc.d-insserv exist.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/insserv.config

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=540&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Thu Jan 17 10:01:26 2008
@@ -1,3 +1,11 @@
+insserv (1.10.0-6) UNRELEASED; urgency=low
+
+  * Allow insserv to be enabled by preseeding by not updating the
+    debconf template default from disk in insserv.config unless
+    /usr/sbin/update-rc.d-insserv exist.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 17 Jan 2008 11:00:21 +0100
+
 insserv (1.10.0-5) unstable; urgency=low
 
   * Made sure to initialize the badstate variable before it is used in

Modified: trunk/src/insserv/debian/insserv.config
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/insserv.config?rev=540&op=diff
==============================================================================
--- trunk/src/insserv/debian/insserv.config (original)
+++ trunk/src/insserv/debian/insserv.config Thu Jan 17 10:01:26 2008
@@ -19,11 +19,15 @@
     esac
 }
 
-if check_divert status /usr/sbin/update-rc.d \
-    /usr/sbin/update-rc.d-insserv ; then
-    db_set insserv/enable true
-else
-    db_set insserv/enable false
+# Only update the default from the status on disk if we are already
+# installed, and not on first time install, to allow preseeding.
+if [ -e /usr/sbin/update-rc.d-insserv ] ; then
+    if check_divert status /usr/sbin/update-rc.d \
+	/usr/sbin/update-rc.d-insserv ; then
+	db_set insserv/enable true
+    else
+	db_set insserv/enable false
+    fi
 fi
 
 db_input medium insserv/enable || [ $? -eq 30 ]