[Initscripts-ng-commits] r214 - in /trunk/src/insserv/debian: changelog patches/00list patches/41_debiandefault.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Fri Sep 15 22:13:16 2006
New Revision: 214

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=214
Log:
New patch 41_debiandefault to set the default runlevels for start (2345)
and stop (016) on Debian.

Added:
    trunk/src/insserv/debian/patches/41_debiandefault.dpatch   (with props)
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/00list

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=214&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Fri Sep 15 22:13:16 2006
@@ -1,8 +1,10 @@
 insserv (1.08.0-8~1) unstable; urgency=low
 
   * Add override files for festival, hotkey-setup and lisa.
-
- -- Petter Reinholdtsen <pere at localhost>  Fri, 15 Sep 2006 14:21:46 +0200
+  * New patch 41_debiandefault to set the default runlevels for start (2345)
+    and stop (016) on Debian.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri, 15 Sep 2006 14:21:46 +0200
 
 insserv (1.08.0-7) unstable; urgency=low
 

Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=214&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Fri Sep 15 22:13:16 2006
@@ -11,4 +11,5 @@
 38_debuginfo
 39_debianlvl
 40_nosusescript
+41_debiandefault
 #51_cfgfilter_dpkg

Added: trunk/src/insserv/debian/patches/41_debiandefault.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/41_debiandefault.dpatch?rev=214&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/41_debiandefault.dpatch (added)
+++ trunk/src/insserv/debian/patches/41_debiandefault.dpatch Fri Sep 15 22:13:16 2006
@@ -1,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 41_debiandefault.dpatch by Petter Reinholdtsen <pere at hungry.com>
+
+Start scripts in runlevel 2345 on non-suse systems, and stop them in
+runlevel 016.
+
+ at DPATCH@
+--- insserv-1.08.0.orig/insserv.c
++++ insserv-1.08.0/insserv.c
+@@ -34,6 +34,14 @@
+ static const int map_runlevel_to_lvl (const int runlevel) __attribute__ ((unused));
+ static const int map_runlevel_to_seek(const int runlevel) __attribute__ ((unused));
+ 
++#ifdef SUSE
++#define DEFAULT_START_LVL "3 5"
++#else
++/* for Debian*/
++#define DEFAULT_START_LVL "2 3 4 5"
++#define DEFAULT_STOP_LVL  "0 1 6"
++#endif
++
+ #ifndef  INITDIR
+ # define INITDIR	"/etc/init.d"
+ #endif
+@@ -1940,7 +1948,7 @@
+ 			    /*
+ 			     * Ahh ... set default multiuser with network
+ 			     */
+-			    script_inf.default_start = xstrdup("3 5");
++			    script_inf.default_start = xstrdup(DEFAULT_START_LVL);
+ 		    }
+ #ifndef SUSE
+ 		    /*
+@@ -1986,15 +1995,12 @@
+ 	    free(begin);
+ 	}
+ 
+-#ifdef SUSE
+ 	/* Ahh ... set default multiuser with network */
+ 	if (!script_inf.default_start || script_inf.default_start == empty)
+-	    script_inf.default_start = xstrdup("3 5");
+-#else  /* not SUSE */
+-	if (!script_inf.default_start || script_inf.default_start == empty)
+-	    script_inf.default_start = xstrdup("2 3 4 5");	/* for Debian*/
++	    script_inf.default_start = xstrdup(DEFAULT_START_LVL);
++#ifndef SUSE
+ 	if (!script_inf.default_stop  || script_inf.default_start == empty)
+-	    script_inf.default_stop  = xstrdup("S 0 1 6");	/* for Debian*/
++	    script_inf.default_stop  = xstrdup(DEFAULT_STOP_LVL);
+ #endif /* not SUSE */
+ 
+ 	if (chkfor(d->d_name, argv, argc) && !defaults) {

Propchange: trunk/src/insserv/debian/patches/41_debiandefault.dpatch
------------------------------------------------------------------------------
    svn:executable = *