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

[pere at users.alioth.debian.org]

Author: pere
Date: Sun Jan  6 18:07:43 2008
New Revision: 460

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=460
Log:
  * Ask if insserv should be activated at install time, using a medium
    priority debconf question.

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

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=460&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Jan  6 18:07:43 2008
@@ -10,6 +10,8 @@
     without LSB header, using the name of the file in /etc/init.d/.
     This make it easier to spot loops involving these scripts.
   * Added override file for hpoj.
+  * Ask if insserv should be activated at install time, using a medium
+    priority debconf question.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun,  6 Jan 2008 11:07:24 +0100
 

Modified: trunk/src/insserv/debian/insserv.config
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/insserv.config?rev=460&op=diff
==============================================================================
--- trunk/src/insserv/debian/insserv.config (original)
+++ trunk/src/insserv/debian/insserv.config Sun Jan  6 18:07:43 2008
@@ -19,10 +19,6 @@
     esac
 }
 
-# Only enable this code if environment variable
-# BAD_INSSERV_HACKER=true is set
-[ true = "$BAD_INSSERV_HACKER" ] || exit 0
-
 if check_divert status /usr/sbin/update-rc.d \
     /usr/sbin/update-rc.d-insserv ; then
     db_set insserv/enable true

Modified: trunk/src/insserv/debian/insserv.postinst
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/insserv.postinst?rev=460&op=diff
==============================================================================
--- trunk/src/insserv/debian/insserv.postinst (original)
+++ trunk/src/insserv/debian/insserv.postinst Sun Jan  6 18:07:43 2008
@@ -23,33 +23,27 @@
 
 case "$1" in
     configure)
+	if check_divert status /usr/sbin/update-rc.d \
+	    /usr/sbin/update-rc.d-insserv ; then
+	    enabled=true
+	fi
 
-	# Only enable this code if environment variable
-	# BAD_INSSERV_HACKER=true is set
-	if [ true = "$BAD_INSSERV_HACKER" ] ; then
-	    db_get insserv/enable || true
-
-	    if check_divert status /usr/sbin/update-rc.d \
-		/usr/sbin/update-rc.d-insserv ; then
-		enabled=true
+	db_get insserv/enable || true
+	if [ true = "$RET" ] && [ true != "$enabled" ]; then
+	    # Enable it, as it was not enabled already.
+	    # Reorder the boot sequence, and divert update-rc.d if
+	    # it worked
+	    if update-bootsystem-insserv ; then
+		echo "success: Boot system successfully converted"
+		: # All OK
+	    else
+		echo "error: Unable to enable dependency based boot system."
 	    fi
-
-	    if [ true = "$RET" ] && [ true != "$enabled" ]; then
-		# Enable it, as it was not enabled already.
-		# Reorder the boot sequence, and divert update-rc.d if
-		# it worked
-		if update-bootsystem-insserv ; then
-		    echo "success: Boot system successfully converted"
-		    : # All OK
-		else
-		    echo "error: Unable to enable dependency based boot system."
-		fi
-	    elif [ true != "$RET" ] ; then
-		if [ true = "$enabled" ] || [ -f $flagfile ]; then
-		    echo "info: Disabling dependency based boot system"
-		    # Revert to old boot system if possible
-		    update-bootsystem-insserv restore
-		fi
+	elif [ true != "$RET" ] ; then
+	    if [ true = "$enabled" ] || [ -f $flagfile ]; then
+		echo "info: Disabling dependency based boot system"
+	        # Revert to old boot system if possible
+		update-bootsystem-insserv restore
 	    fi
 	fi
 	;;

Modified: trunk/src/insserv/debian/insserv.prerm
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/insserv.prerm?rev=460&op=diff
==============================================================================
--- trunk/src/insserv/debian/insserv.prerm (original)
+++ trunk/src/insserv/debian/insserv.prerm Sun Jan  6 18:07:43 2008
@@ -28,7 +28,7 @@
 	    /usr/sbin/update-rc.d-insserv || [ -f $flagfile ] ; then
 	    echo "error: insserv must be disabled before it is removed, to"
 	    echo "error: make sure the boot system is still usable."
-	    echo "error: To disable, run BAD_INSSERV_HACKER=true dpkg-reconfigure insserv"
+	    echo "error: To disable, run dpkg-reconfigure insserv"
 	    exit 1
 	fi
 	;;