[Initscripts-ng-commits] r131 - in /trunk/src/insserv/debian: changelog control insserv.config insserv.postinst insserv.templates rules update-bootsystem-insserv update-rc.d-insserv

pere at users.alioth.debian.org pere at users.alioth.debian.org
Thu Sep 7 11:18:00 UTC 2006 

Author: pere
Date: Thu Sep  7 11:17:58 2006
New Revision: 131

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=131
Log:
   * New upstream release.

Added:
    trunk/src/insserv/debian/insserv.config
    trunk/src/insserv/debian/insserv.postinst
    trunk/src/insserv/debian/insserv.templates
    trunk/src/insserv/debian/update-rc.d-insserv
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/control
    trunk/src/insserv/debian/rules
    trunk/src/insserv/debian/update-bootsystem-insserv

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=131&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Thu Sep  7 11:17:58 2006
@@ -2,6 +2,9 @@
 
   * Change update-bootsystem-insserv to refuse to convert the boot
     system if there are dependency loops.
+  * Make sketch implementation for enabling the dependency based boot
+    system using a debconf question when the insserv package is
+    installed.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu,  7 Sep 2006 12:47:39 +0200
 

Modified: trunk/src/insserv/debian/control
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/control?rev=131&op=diff
==============================================================================
--- trunk/src/insserv/debian/control (original)
+++ trunk/src/insserv/debian/control Thu Sep  7 11:17:58 2006
@@ -7,7 +7,7 @@
 
 Package: insserv
 Architecture: any
-Depends: ${shlibs:Depends}, sysv-rc
+Depends: ${shlibs:Depends}, ${misc:Depends}, sysv-rc
 Recommends: perl-modules
 Suggests: bootchart
 Description: Reorder boot sequence based on LSB init.d script dependencies

Added: trunk/src/insserv/debian/insserv.config
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/insserv.config?rev=131&op=file
==============================================================================
--- trunk/src/insserv/debian/insserv.config (added)
+++ trunk/src/insserv/debian/insserv.config Thu Sep  7 11:17:58 2006
@@ -1,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+flagfile=/etc/update-rc.d-insserv
+
+if [ -f $flagfile ] ; then
+    db_set insserv/enable true
+else
+    db_set insserv/enable false
+fi
+
+db_input medium insserv/enable || [ $? -eq 30 ]
+db_go || true

Added: trunk/src/insserv/debian/insserv.postinst
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/insserv.postinst?rev=131&op=file
==============================================================================
--- trunk/src/insserv/debian/insserv.postinst (added)
+++ trunk/src/insserv/debian/insserv.postinst Thu Sep  7 11:17:58 2006
@@ -1,0 +1,33 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+flagfile=/etc/update-rc.d-insserv
+
+case "$1" in
+    configure)
+	db_get insserv/enable || true
+	if [ "$RET" = true ] ; then # Make sure it is enabled
+
+	    # Reorder the boot sequence
+	    if update-bootsystem-insserv ; then
+		: # All OK
+		echo "success: Boot system successfully converted"
+		touch $flagfile
+	    else
+		echo "error: Unable to enable dependency based boot system."
+	    fi
+
+	    # Divert update-rc.d to update-rc.d-insserv
+	elif [ -f $flagfile ] ; then # Disable it
+	    # Undo divert
+
+	    # Revert to old boot order if possible
+	    update-bootsystem-insserv remove
+	fi
+	;;
+    *)
+	;;
+esac

Added: trunk/src/insserv/debian/insserv.templates
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/insserv.templates?rev=131&op=file
==============================================================================
--- trunk/src/insserv/debian/insserv.templates (added)
+++ trunk/src/insserv/debian/insserv.templates Thu Sep  7 11:17:58 2006
@@ -1,0 +1,10 @@
+Template: insserv/enable
+Type: boolean
+Description: Enable dependency based update-rc.d using insserv?
+ This will reorder all the scripts in /etc/rc*.d/ using the dependency
+ information provided in each script and insserv-provided dependency
+ info in case the scripts are missing dependency info.
+ .
+ This is an experimental feature, and is only intended for testing of
+ insserv.
+

Modified: trunk/src/insserv/debian/rules
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/rules?rev=131&op=diff
==============================================================================
--- trunk/src/insserv/debian/rules (original)
+++ trunk/src/insserv/debian/rules Thu Sep  7 11:17:58 2006
@@ -54,6 +54,7 @@
 	$(INSTALL_DATA) debian/overrides/* $(DESTDIR)$(pkgdatadir)/overrides/.
 	$(INSTALL) debian/check-initd-order $(DESTDIR)$(pkgdatadir)/.
 	$(INSTALL) debian/update-bootsystem-insserv $(DESTDIR)$(sbindir)/.
+	$(INSTALL) debian/update-rc.d-insserv $(DESTDIR)$(sbindir)/.
 
 
 # Build architecture-independent files here.
@@ -67,6 +68,7 @@
 	dh_installchangelogs CHANGES
 	dh_installdocs
 	dh_installexamples
+	dh_installdebconf
 #	dh_install
 	dh_installman debian/update-bootsystem-insserv.8
 	dh_link

Modified: trunk/src/insserv/debian/update-bootsystem-insserv
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/update-bootsystem-insserv?rev=131&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-bootsystem-insserv (original)
+++ trunk/src/insserv/debian/update-bootsystem-insserv Thu Sep  7 11:17:58 2006
@@ -61,3 +61,5 @@
 
     echo "info: Use '$0 restore' to restore the old boot sequence."
 fi
+
+exit 0

Added: trunk/src/insserv/debian/update-rc.d-insserv
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/update-rc.d-insserv?rev=131&op=file
==============================================================================
--- trunk/src/insserv/debian/update-rc.d-insserv (added)
+++ trunk/src/insserv/debian/update-rc.d-insserv Thu Sep  7 11:17:58 2006
@@ -1,0 +1,13 @@
+#!/bin/sh
+
+flagfile=/etc/update-rc.d-insserv
+
+if [ -f $flagfile ] ; then
+    insserv $scriptname
+else
+    echo error: Inconsistent update-rc.d configuration.  The flag file
+    echo error: $flagfile is missing,
+    echo error: but the update-rc.d divert is still in place.  Calling
+    echo error: the version from sysv-rc directly.
+    exec /usr/sbin/update-rc.d.distrib
+fi

More information about the Initscripts-ng-commits mailing list