[Initscripts-ng-commits] r124 - in /trunk/src/insserv/debian: ./
overrides/ patches/
pere at users.alioth.debian.org
pere at users.alioth.debian.org
Wed Sep 6 22:33:44 UTC 2006
Author: pere
Date: Wed Sep 6 22:33:43 2006
New Revision: 124
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=124
Log:
Update to latest version.
Added:
trunk/src/insserv/debian/overrides/libdevmapper1.02
trunk/src/insserv/debian/patches/35_fixunused.dpatch (with props)
trunk/src/insserv/debian/patches/36_memleak.dpatch (with props)
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/control
trunk/src/insserv/debian/overrides/acpid
trunk/src/insserv/debian/overrides/alsa
trunk/src/insserv/debian/overrides/alsa-utils
trunk/src/insserv/debian/overrides/apmd
trunk/src/insserv/debian/overrides/atd
trunk/src/insserv/debian/overrides/bootlogd
trunk/src/insserv/debian/overrides/cfengine2
trunk/src/insserv/debian/overrides/checkfs.sh
trunk/src/insserv/debian/overrides/checkroot.sh
trunk/src/insserv/debian/overrides/console-screen.sh
trunk/src/insserv/debian/overrides/cpufreqd
trunk/src/insserv/debian/overrides/devfsd
trunk/src/insserv/debian/overrides/discover
trunk/src/insserv/debian/overrides/exim4
trunk/src/insserv/debian/overrides/fam
trunk/src/insserv/debian/overrides/flashybrid
trunk/src/insserv/debian/overrides/hdparm
trunk/src/insserv/debian/overrides/hotplug
trunk/src/insserv/debian/overrides/initrd-tools.sh
trunk/src/insserv/debian/overrides/kdm
trunk/src/insserv/debian/overrides/keymap.sh
trunk/src/insserv/debian/overrides/ltsp-client-setup
trunk/src/insserv/debian/overrides/lvm
trunk/src/insserv/debian/overrides/makedev
trunk/src/insserv/debian/overrides/mdadm
trunk/src/insserv/debian/overrides/module-init-tools
trunk/src/insserv/debian/overrides/mountnfs.sh
trunk/src/insserv/debian/overrides/mountvirtfs
trunk/src/insserv/debian/overrides/networking
trunk/src/insserv/debian/overrides/nfs-common
trunk/src/insserv/debian/overrides/nfs-kernel-server
trunk/src/insserv/debian/overrides/pcmcia
trunk/src/insserv/debian/overrides/portmap
trunk/src/insserv/debian/overrides/pppd-dns
trunk/src/insserv/debian/overrides/procps.sh
trunk/src/insserv/debian/overrides/reboot
trunk/src/insserv/debian/overrides/rmnologin
trunk/src/insserv/debian/overrides/single
trunk/src/insserv/debian/overrides/sudo
trunk/src/insserv/debian/overrides/udev
trunk/src/insserv/debian/overrides/udev-mtab
trunk/src/insserv/debian/overrides/umountfs
trunk/src/insserv/debian/overrides/umountnfs.sh
trunk/src/insserv/debian/overrides/wpasupplicant
trunk/src/insserv/debian/overrides/xsupplicant
trunk/src/insserv/debian/patches/00list
trunk/src/insserv/debian/patches/31_debian_conf.dpatch
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=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Wed Sep 6 22:33:43 2006
@@ -1,11 +1,36 @@
-insserv (1.08.0-2) UNRELEASED; urgency=low
+insserv (1.08.0-3) unstable; urgency=low
- * Corrected override file for libdevmapper1.00 and libdevmapper1.01.
- * Update override files for bootmisc.sh, console-screen.sh,
- cryptdisks, halt, hdparm, keymap.sh, mountall, urandom and
- xdebconfigurator to match the init.d scripts in Debian/sid.
+ * Change mountvirtfs to mountdevsubfs in all override files, to
+ use the new name instead of the obsolete name.
+ * the keymap override should not depend on $syslog, and neither should
+ keymap.sh itself (bug #386338).
- -- Petter Reinholdtsen <pere at debian.org> Tue, 4 Jul 2006 22:31:08 +0200
+ -- Petter Reinholdtsen <pere at debian.org> Thu, 7 Sep 2006 00:18:12 +0200
+
+insserv (1.08.0-2) unstable; urgency=low
+
+ * New patch 35_fixunused removing incorrect 'unused' flagg from a
+ few functions, to avoid compile warning on s390.
+ * New patch 36_memleak fixing a minor memory leak.
+ * Updated override file for libdevmapper1.00.
+ * Added override file for libdevmapper1.02.
+ * Sync override files with the unstable init.d scripts for
+ alsa,alsa-utils, atd, bootlogd, bootmisc.sh, cfengine2,
+ checkfs.sh, checkroot.sh, console-screen.sh, cryptdisk, exim4,
+ fam, halt, hdparm, kdm, keymap.sh, makedev, module-init-tools,
+ mountall.sh, mountnfs.sh, networking, nfs-common,
+ nfs-kernel-server, pcmcia, portmap, pppd-dns, procps.sh, reboot,
+ rmnologin, single, sudo, udev, udev-mtab, umountfs, umountnfs.sh,
+ urandom and xdebconfigurator. I assume the package maintainer
+ know the scripts best, and use their values.
+ * Modify update-bootsystem-insserv to report dependency loop
+ problems. (Closes: #386301)
+ * Add recommend on perl-modules. (Closes: #386300)
+ * Update standards-version to 2.7.2. No changes needed.
+ * Do not include 'klogd' in the $syslog facility, to avoid
+ dependency loop.
+
+ -- Petter Reinholdtsen <pere at debian.org> Sat, 1 Apr 2006 18:35:05 +0200
insserv (1.08.0-1) unstable; urgency=low
Modified: trunk/src/insserv/debian/control
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/control?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/control (original)
+++ trunk/src/insserv/debian/control Wed Sep 6 22:33:43 2006
@@ -3,11 +3,12 @@
Priority: optional
Maintainer: Petter Reinholdtsen <pere at debian.org>
Build-Depends: debhelper (>= 4.0.0), dpatch
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Package: insserv
Architecture: any
Depends: ${shlibs:Depends}, sysv-rc
+Recommends: perl-modules
Suggests: bootchart
Description: Reorder boot sequence based on LSB init.d script dependencies
Reorder the boot order based on init.d script dependencies as
Modified: trunk/src/insserv/debian/overrides/acpid
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/acpid?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/acpid (original)
+++ trunk/src/insserv/debian/overrides/acpid Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: acpid
-# Required-Start: mountvirtfs $syslog
-# Required-Stop: mountvirtfs $syslog
+# Required-Start: mountdevsubfs $syslog
+# Required-Stop: mountdevsubfs $syslog
# Default-Start: S 1 2 3 4 5
# Default-Stop: 0 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/alsa
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/alsa?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/alsa (original)
+++ trunk/src/insserv/debian/overrides/alsa Wed Sep 6 22:33:43 2006
@@ -1,8 +1,8 @@
### BEGIN INIT INFO
# Provides: alsa
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start: 1 2 3 4 5
-# Default-Stop: S 0 6
+# Required-Start: mountall
+# Required-Stop: mountall
+# Default-Start: S
+# Default-Stop: 0 1 6
### END INIT INFO
# Reported to Debian BTS as #337638, updated deps after reporting
Modified: trunk/src/insserv/debian/overrides/alsa-utils
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/alsa-utils?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/alsa-utils (original)
+++ trunk/src/insserv/debian/overrides/alsa-utils Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: alsa-utils
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: S 0 1 6
+# Required-Start: mountall
+# Required-Stop: mountall
+# Default-Start: S
+# Default-Stop: 0 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/apmd
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/apmd?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/apmd (original)
+++ trunk/src/insserv/debian/overrides/apmd Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: apmd
-# Required-Start: mountvirtfs $syslog
-# Required-Stop: mountvirtfs $syslog
+# Required-Start: mountdevsubfs $syslog
+# Required-Stop: mountdevsubfs $syslog
# Default-Start: S 1 2 3 4 5
# Default-Stop: 0 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/atd
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/atd?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/atd (original)
+++ trunk/src/insserv/debian/overrides/atd Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: atd
-# Required-Start: $syslog $time $local_fs
-# Required-Stop: $syslog $time $local_fs
+# Required-Start: $syslog $time $local_fs $remote_fs
+# Required-Stop: $syslog $time $local_fs $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: S 0 1 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/bootlogd
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/bootlogd?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/bootlogd (original)
+++ trunk/src/insserv/debian/overrides/bootlogd Wed Sep 6 22:33:43 2006
@@ -1,8 +1,8 @@
### BEGIN INIT INFO
# Provides: bootlogd
-# Required-Start: mountvirtfs
+# Required-Start: mountdevsubfs
# Required-Stop:
# Default-Start: S
-# Default-Stop: 0 1 2 3 4 5 6
+# Default-Stop:
### END INIT INFO
# Already present in package
Modified: trunk/src/insserv/debian/overrides/cfengine2
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/cfengine2?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/cfengine2 (original)
+++ trunk/src/insserv/debian/overrides/cfengine2 Wed Sep 6 22:33:43 2006
@@ -1,9 +1,7 @@
### BEGIN INIT INFO
# Provides: cfengine2
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Should-Start: $network
-# Should-Stop: $network
+# Required-Start: $local_fs $remote_fs $network $time
+# Required-Stop: $local_fs $remote_fs $network
# Default-Start: 2 3 4 5
-# Default-Stop: S 0 1 6
+# Default-Stop: 0 1 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/checkfs.sh
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/checkfs.sh?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/checkfs.sh (original)
+++ trunk/src/insserv/debian/overrides/checkfs.sh Wed Sep 6 22:33:43 2006
@@ -1,9 +1,9 @@
### BEGIN INIT INFO
# Provides: checkfs
-# Required-Start: checkroot
+# Required-Start: modutils checkroot
# Required-Stop:
-# Should-Start: lvm cryptdisks modutils module-init-tools
-# Should-Stop: lvm cryptdisks modutils module-init-tools
+# Should-Start: lvm cryptdisks
+# Should-Stop:
# Default-Start: S
# Default-Stop:
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/checkroot.sh
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/checkroot.sh?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/checkroot.sh (original)
+++ trunk/src/insserv/debian/overrides/checkroot.sh Wed Sep 6 22:33:43 2006
@@ -1,6 +1,6 @@
### BEGIN INIT INFO
# Provides: checkroot
-# Required-Start: mountvirtfs
+# Required-Start: mountdevsubfs
# Required-Stop:
# Should-Start: keymap hwclockfirst
# Should-stop:
Modified: trunk/src/insserv/debian/overrides/console-screen.sh
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/console-screen.sh?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/console-screen.sh (original)
+++ trunk/src/insserv/debian/overrides/console-screen.sh Wed Sep 6 22:33:43 2006
@@ -4,5 +4,7 @@
# Required-Stop: $local_fs $remote_fs
# Default-Start: S 2 3 4 5
# Default-Stop: 0 1 6
+# Should-Start: $syslog
+# Should-Stop:
### END INIT INFO
# Reported to BTS as bug #330229
Modified: trunk/src/insserv/debian/overrides/cpufreqd
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/cpufreqd?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/cpufreqd (original)
+++ trunk/src/insserv/debian/overrides/cpufreqd Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: cpufreqd
-# Required-Start: mountvirtfs $local_fs $remote_fs
-# Required-Stop: mountvirtfs $local_fs $remote_fs
+# Required-Start: mountdevsubfs $local_fs $remote_fs
+# Required-Stop: mountdevsubfs $local_fs $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: S 0 1 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/devfsd
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/devfsd?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/devfsd (original)
+++ trunk/src/insserv/debian/overrides/devfsd Wed Sep 6 22:33:43 2006
@@ -1,6 +1,6 @@
### BEGIN INIT INFO
# Provides: devfsd
-# Required-Start: mountvirtfs
+# Required-Start: mountdevsubfs
# Required-Stop: reboot
# Default-Start: S 1 2 3 4 5
# Default-Stop: 0 6
Modified: trunk/src/insserv/debian/overrides/discover
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/discover?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/discover (original)
+++ trunk/src/insserv/debian/overrides/discover Wed Sep 6 22:33:43 2006
@@ -1,6 +1,6 @@
### BEGIN INIT INFO
# Provides: discover
-# Required-Start: mountvirtfs checkroot $local_fs
+# Required-Start: mountdevsubfs checkroot $local_fs
# Required-Stop:
# Default-Start: S 1 2 3 4 5
# Default-Stop: 0 6
Modified: trunk/src/insserv/debian/overrides/exim4
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/exim4?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/exim4 (original)
+++ trunk/src/insserv/debian/overrides/exim4 Wed Sep 6 22:33:43 2006
@@ -1,7 +1,9 @@
### BEGIN INIT INFO
-# Provides: exim4 exim
-# Required-Start: $network $syslog
-# Required-Stop: $network $syslog
+# Provides: exim4 mail-transport-agent
+# Required-Start: $local_fs $remote_fs $syslog $named $network $time
+# Required-Stop: $local_fs $remote_fs $syslog $named $network
+# Should-Start: postgresql mysql clamav-daemon greylist spamassassin
+# Should-Stop: postgresql mysql clamav-daemon greylist spamassassin
# Default-Start: 2 3 4 5
-# Default-Stop: S 0 1 6
+# Default-Stop: 0 1 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/fam
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/fam?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/fam (original)
+++ trunk/src/insserv/debian/overrides/fam Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: fam
-# Required-Start: $network $portmap
-# Required-Stop: $network $portmap
+# Required-Start: $network portmap
+# Required-Stop: $network portmap
# Default-Start: 1 2 3 4 5
# Default-Stop: S 0 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/flashybrid
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/flashybrid?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/flashybrid (original)
+++ trunk/src/insserv/debian/overrides/flashybrid Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: flashhybrid
-# Required-Start: mountvirtfs $local_fs
-# Required-Stop: mountvirtfs $local_fs
+# Required-Start: mountdevsubfs $local_fs
+# Required-Stop: mountdevsubfs $local_fs
# Default-Start: S 6
# Default-Stop:
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/hdparm
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/hdparm?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/hdparm (original)
+++ trunk/src/insserv/debian/overrides/hdparm Wed Sep 6 22:33:43 2006
@@ -1,6 +1,6 @@
### BEGIN INIT INFO
# Provides: hdparm
-# Required-Start: mountvirtfs
+# Required-Start: mountdevsubfs
# Should-Start: udev
# Required-Stop:
# Default-Start: S
Modified: trunk/src/insserv/debian/overrides/hotplug
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/hotplug?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/hotplug (original)
+++ trunk/src/insserv/debian/overrides/hotplug Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: hotplug
-# Required-Start: mountvirtfs checkroot $local_fs
-# Required-Stop: mountvirtfs
+# Required-Start: mountdevsubfs checkroot $local_fs
+# Required-Stop: mountdevsubfs
# Default-Start: S 1 2 3 4 5
# Default-Stop: 0 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/initrd-tools.sh
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/initrd-tools.sh?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/initrd-tools.sh (original)
+++ trunk/src/insserv/debian/overrides/initrd-tools.sh Wed Sep 6 22:33:43 2006
@@ -1,6 +1,6 @@
### BEGIN INIT INFO
# Provides: initrd-tools
-# Required-Start: mountvirtfs
+# Required-Start: mountdevsubfs
# Required-Stop:
# Default-Start: S
# Default-Stop:
Modified: trunk/src/insserv/debian/overrides/kdm
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/kdm?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/kdm (original)
+++ trunk/src/insserv/debian/overrides/kdm Wed Sep 6 22:33:43 2006
@@ -1,9 +1,9 @@
### BEGIN INIT INFO
-# Provides: kdm
+# Provides: x-display-manager kdm
# Required-Start: $local_fs $remote_fs
# Required-Stop: $local_fs $remote_fs
-# Should-Start: xfs $named slapd
-# Should-Stop: xfs $named slapd
+# Should-Start: console-screen
+# Should-Stop: console-screen
# Default-Start: 2 3 4 5
-# Default-Stop: S 0 1 6
+# Default-Stop: 0 1 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/keymap.sh
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/keymap.sh?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/keymap.sh (original)
+++ trunk/src/insserv/debian/overrides/keymap.sh Wed Sep 6 22:33:43 2006
@@ -1,8 +1,10 @@
### BEGIN INIT INFO
# Provides: keymap
-# Required-Start: mountvirtfs
+# Required-Start: mountdevsubfs
# Required-Stop:
# Default-Start: S 2 3 4 5
# Default-Stop: 0 1 6
+# Should-Start:
+# Should-Stop:
### END INIT INFO
# Reported to BTS as bug #330231
Added: trunk/src/insserv/debian/overrides/libdevmapper1.02
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/libdevmapper1.02?rev=124&op=file
==============================================================================
--- trunk/src/insserv/debian/overrides/libdevmapper1.02 (added)
+++ trunk/src/insserv/debian/overrides/libdevmapper1.02 Wed Sep 6 22:33:43 2006
@@ -1,0 +1,8 @@
+### BEGIN INIT INFO
+# Provides: libdevmapper
+# Required-Start: modutils
+# Required-Stop: modutils
+# Should-Start: hotplug discover udev devfsd
+# Default-Start: S 2 3 4 5
+# Default-Stop: 0 1 6
+### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/ltsp-client-setup
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/ltsp-client-setup?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/ltsp-client-setup (original)
+++ trunk/src/insserv/debian/overrides/ltsp-client-setup Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: ltsp-client-setup
-# Required-Start: mountvirtfs $local_fs
-# Required-Stop: mountvirtfs $local_fs
+# Required-Start: mountdevsubfs $local_fs
+# Required-Stop: mountdevsubfs $local_fs
# Default-Start: S 1 2 3 4 5
# Default-Stop: 0 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/lvm
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/lvm?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/lvm (original)
+++ trunk/src/insserv/debian/overrides/lvm Wed Sep 6 22:33:43 2006
@@ -1,6 +1,6 @@
### BEGIN INIT INFO
# Provides: lvm
-# Required-Start: mountvirtfs
+# Required-Start: mountdevsubfs
# Required-Stop:
# Should-Start: udev devfsd raid2 mdadm
# Should-Stop:
Modified: trunk/src/insserv/debian/overrides/makedev
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/makedev?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/makedev (original)
+++ trunk/src/insserv/debian/overrides/makedev Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: makedev
# Required-Start: $local_fs
-# Required-Stop:
-# Default-Start: S 1 2 3 4 5
-# Default-Stop: 0 6
+# Required-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/mdadm
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/mdadm?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/mdadm (original)
+++ trunk/src/insserv/debian/overrides/mdadm Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: mdadm
-# Required-Start: mountvirtfs
-# Required-Stop: mountvirtfs
+# Required-Start: mountdevsubfs
+# Required-Stop: mountdevsubfs
# Should-Start: devfsd udev
# Default-Start: S 1 2 3 4 5
# Default-Stop: 0 6
Modified: trunk/src/insserv/debian/overrides/module-init-tools
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/module-init-tools?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/module-init-tools (original)
+++ trunk/src/insserv/debian/overrides/module-init-tools Wed Sep 6 22:33:43 2006
@@ -1,7 +1,9 @@
### BEGIN INIT INFO
# Provides: module-init-tools
-# Required-Start: hwclockfirst checkroot
-# Required-Stop: hwclockfirst checkroot
-# Default-Start: S 1 2 3 4 5
-# Default-Stop: 0 6
+# Required-Start:
+# Required-Stop:
+# Should-Start: checkroot
+# Should-Stop:
+# Default-Start: S
+# Default-Stop:
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/mountnfs.sh
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/mountnfs.sh?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/mountnfs.sh (original)
+++ trunk/src/insserv/debian/overrides/mountnfs.sh Wed Sep 6 22:33:43 2006
@@ -1,5 +1,5 @@
### BEGIN INIT INFO
-# Provides: mountnfs nfs
+# Provides: mountnfs
# Required-Start: $network $local_fs
# Required-Stop:
# Default-Start: S
Modified: trunk/src/insserv/debian/overrides/mountvirtfs
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/mountvirtfs?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/mountvirtfs (original)
+++ trunk/src/insserv/debian/overrides/mountvirtfs Wed Sep 6 22:33:43 2006
@@ -1,5 +1,5 @@
### BEGIN INIT INFO
-# Provides: mountvirtfs
+# Provides: mountdevsubfs
# Required-Start:
# Required-Stop:
# Default-Start: S
Modified: trunk/src/insserv/debian/overrides/networking
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/networking?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/networking (original)
+++ trunk/src/insserv/debian/overrides/networking Wed Sep 6 22:33:43 2006
@@ -1,8 +1,6 @@
### BEGIN INIT INFO
# Provides: networking
-# Required-Start: mountvirtfs ifupdown $local_fs
-# Required-Stop: mountvirtfs
-# Should-Start: hotplug discover
+# Required-Start: mountdevsubfs ifupdown $local_fs
# Default-Start: S
# Default-Stop: 0 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/nfs-common
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/nfs-common?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/nfs-common (original)
+++ trunk/src/insserv/debian/overrides/nfs-common Wed Sep 6 22:33:43 2006
@@ -1,7 +1,6 @@
### BEGIN INIT INFO
# Provides: nfs-common
-# Required-Start: $network $portmap
-# Required-Stop: $network $portmap
+# Required-Start: $time
# Default-Start: 2 3 4 5
-# Default-Stop: S 0 1 6
+# Default-Stop: 0 1 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/nfs-kernel-server
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/nfs-kernel-server?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/nfs-kernel-server (original)
+++ trunk/src/insserv/debian/overrides/nfs-kernel-server Wed Sep 6 22:33:43 2006
@@ -1,7 +1,6 @@
### BEGIN INIT INFO
-# Provides: nfs-kernel-server nfs-server
-# Required-Start: $network $portmap
-# Required-Stop: $network $portmap
+# Provides: nfs-kernel-server
+# Required-Start: $portmap $time
# Default-Start: 2 3 4 5
-# Default-Stop: S 0 1 6
+# Default-Stop: 0 1 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/pcmcia
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/pcmcia?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/pcmcia (original)
+++ trunk/src/insserv/debian/overrides/pcmcia Wed Sep 6 22:33:43 2006
@@ -1,7 +1,5 @@
### BEGIN INIT INFO
# Provides: pcmcia
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: S 0 1 6
+# Default-Start: 1 2 3 4 5
+# Default-Stop: 0 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/portmap
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/portmap?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/portmap (original)
+++ trunk/src/insserv/debian/overrides/portmap Wed Sep 6 22:33:43 2006
@@ -4,7 +4,7 @@
# Required-Stop: $network
# Should-Start: $named
# Should-Stop: $named
-# Default-Start: S 1 2 3 4 5
-# Default-Stop: 0 6
+# Default-Start: S 2 3 4 5
+# Default-Stop: 0 1 6
### END INIT INFO
# Reported to BTS as bug #326125
Modified: trunk/src/insserv/debian/overrides/pppd-dns
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/pppd-dns?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/pppd-dns (original)
+++ trunk/src/insserv/debian/overrides/pppd-dns Wed Sep 6 22:33:43 2006
@@ -1,7 +1,5 @@
### BEGIN INIT INFO
# Provides: pppd-dns
-# Required-Start: $local_fs dns-clean
-# Required-Stop: $local_fs
-# Default-Start: S 1 2 3 4 5
-# Default-Stop: 0 6
+# Required-Start: $local_fs
+# Default-Start: S
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/procps.sh
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/procps.sh?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/procps.sh (original)
+++ trunk/src/insserv/debian/overrides/procps.sh Wed Sep 6 22:33:43 2006
@@ -1,8 +1,8 @@
### BEGIN INIT INFO
# Provides: procps
-# Required-Start: mountvirtfs
+# Required-Start: mountdevsubfs
# Required-Stop:
-# Default-Start: S
-# Default-Stop:
+# Default-Start: S 1 2 3 4 5
+# Default-Stop: 0 6
### END INIT INFO
# Reported to BTS as #335320
Modified: trunk/src/insserv/debian/overrides/reboot
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/reboot?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/reboot (original)
+++ trunk/src/insserv/debian/overrides/reboot Wed Sep 6 22:33:43 2006
@@ -1,6 +1,6 @@
### BEGIN INIT INFO
# Provides: reboot
-# Required-Start: umountfs $network
+# Required-Start: umountroot $network
# Required-Stop:
# Should-Start: lvm raid2
# Default-Start: 6
Modified: trunk/src/insserv/debian/overrides/rmnologin
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/rmnologin?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/rmnologin (original)
+++ trunk/src/insserv/debian/overrides/rmnologin Wed Sep 6 22:33:43 2006
@@ -1,8 +1,9 @@
### BEGIN INIT INFO
# Provides: rmnologin
-# Required-Start: $local_fs $remote_fs
+# Required-Start: $local_fs $remote_fs $all
# Required-Stop:
-# Default-Start: S 1 2 3 4 5
-# Default-Stop:
+# Should-Start: kdm xdm gdm $syslog
+# Default-Start: 1 2 3 4 5
+# Default-Stop: 0 6
### END INIT INFO
# Already present in package
Modified: trunk/src/insserv/debian/overrides/single
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/single?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/single (original)
+++ trunk/src/insserv/debian/overrides/single Wed Sep 6 22:33:43 2006
@@ -1,6 +1,6 @@
### BEGIN INIT INFO
# Provides: single
-# Required-Start: $local_fs
+# Required-Start: $local_fs killprocs
# Required-Stop:
# Default-Start: 1
# Default-Stop:
Modified: trunk/src/insserv/debian/overrides/sudo
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/sudo?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/sudo (original)
+++ trunk/src/insserv/debian/overrides/sudo Wed Sep 6 22:33:43 2006
@@ -1,8 +1,8 @@
### BEGIN INIT INFO
-# Provides: sudu
+# Provides: sudo
# Required-Start: $local_fs $remote_fs
# Required-Stop:
-# Default-Start: S 1 2 3 4 5
-# Default-Stop: 0 6
+# Default-Start: S 2 3 4 5
+# Default-Stop: 0 1 6
### END INIT INFO
# Reported to BTS as bug #332849
Modified: trunk/src/insserv/debian/overrides/udev
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/udev?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/udev (original)
+++ trunk/src/insserv/debian/overrides/udev Wed Sep 6 22:33:43 2006
@@ -1,8 +1,8 @@
### BEGIN INIT INFO
# Provides: udev
-# Required-Start: mountvirtfs
+# Required-Start: mountkernfs
# Required-Stop:
-# Default-Start: S 1 2 3 4 5
-# Default-Stop: 0 6
+# Default-Start: S
+# Default-Stop:
### END INIT INFO
# Reported to BTS as #335310
Modified: trunk/src/insserv/debian/overrides/udev-mtab
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/udev-mtab?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/udev-mtab (original)
+++ trunk/src/insserv/debian/overrides/udev-mtab Wed Sep 6 22:33:43 2006
@@ -1,8 +1,8 @@
### BEGIN INIT INFO
# Provides: udev-mtab
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
+# Required-Start: udev checkroot
+# Required-Stop:
# Default-Start: S
-# Default-Stop: 0 1 6
+# Default-Stop:
### END INIT INFO
# Reported to BTS as #335310
Modified: trunk/src/insserv/debian/overrides/umountfs
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/umountfs?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/umountfs (original)
+++ trunk/src/insserv/debian/overrides/umountfs Wed Sep 6 22:33:43 2006
@@ -1,8 +1,8 @@
### BEGIN INIT INFO
# Provides: umountfs
-# Required-Start: umountnfs
+# Required-Start: umountnfs urandom
# Required-Stop:
-# Default-Start: 6
+# Default-Start: 0 6
# Default-Stop:
### END INIT INFO
# Already present in package
Modified: trunk/src/insserv/debian/overrides/umountnfs.sh
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/umountnfs.sh?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/umountnfs.sh (original)
+++ trunk/src/insserv/debian/overrides/umountnfs.sh Wed Sep 6 22:33:43 2006
@@ -1,6 +1,6 @@
### BEGIN INIT INFO
# Provides: umountnfs
-# Required-Start:
+# Required-Start: sendsigs
# Required-Stop:
# Default-Start: 6
# Default-Stop:
Modified: trunk/src/insserv/debian/overrides/wpasupplicant
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/wpasupplicant?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/wpasupplicant (original)
+++ trunk/src/insserv/debian/overrides/wpasupplicant Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: wpasupplicant
-# Required-Start: mountvirtfs $local_fs $remote_fs
-# Required-Stop: mountvirtfs $local_fs $remote_fs
+# Required-Start: mountdevsubfs $local_fs $remote_fs
+# Required-Stop: mountdevsubfs $local_fs $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: S 0 1 6
### END INIT INFO
Modified: trunk/src/insserv/debian/overrides/xsupplicant
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/overrides/xsupplicant?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/overrides/xsupplicant (original)
+++ trunk/src/insserv/debian/overrides/xsupplicant Wed Sep 6 22:33:43 2006
@@ -1,7 +1,7 @@
### BEGIN INIT INFO
# Provides: xsupplicant
-# Required-Start: mountvirtfs $local_fs $remote_fs
-# Required-Stop: mountvirtfs $local_fs $remote_fs
+# Required-Start: mountdevsubfs $local_fs $remote_fs
+# Required-Stop: mountdevsubfs $local_fs $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: S 0 1 6
### END INIT INFO
Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Wed Sep 6 22:33:43 2006
@@ -4,4 +4,6 @@
31_debian_conf
32_debian_nolsb
#34_debian
+35_fixunused
+36_memleak
#51_cfgfilter_dpkg
Modified: trunk/src/insserv/debian/patches/31_debian_conf.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/31_debian_conf.dpatch?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/31_debian_conf.dpatch (original)
+++ trunk/src/insserv/debian/patches/31_debian_conf.dpatch Wed Sep 6 22:33:43 2006
@@ -36,7 +36,7 @@
# System logger is operational
#
-$syslog syslog
-+$syslog sysklogd klogd
++$syslog sysklogd
#
# All network daemons are running (this entry is OBSOLETE)
Added: trunk/src/insserv/debian/patches/35_fixunused.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/35_fixunused.dpatch?rev=124&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/35_fixunused.dpatch (added)
+++ trunk/src/insserv/debian/patches/35_fixunused.dpatch Wed Sep 6 22:33:43 2006
@@ -1,0 +1,84 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 35_fixunused.dpatch by Petter Reinholdtsen <pere at hungry.com>
+
+When uploading version 1.08.0 of insserv into Debian this build
+warning was discovered on s390:
+
+ insserv.c:35: warning: type qualifiers ignored on function return type
+ insserv.c:36: warning: type qualifiers ignored on function return type
+ insserv.c:1237: warning: type qualifiers ignored on function return type
+ insserv.c:1242: warning: type qualifiers ignored on function return type
+
+The problem is the use of the unused attribute. There is also a
+problem with lack of 'const' on the map_runlevel_to_location()
+function. This patch fixes these problems.
+
+It was sent upstream 2006-04-01.
+
+ at DPATCH@
+--- insserv-1.08.0.orig/insserv.c
++++ insserv-1.08.0/insserv.c
+@@ -30,9 +30,11 @@
+ #include <getopt.h>
+ #include "listing.h"
+
+-static char *map_runlevel_to_location(const int runlevel);
+-static const int map_runlevel_to_lvl (const int runlevel) __attribute__ ((unused));
+-static const int map_runlevel_to_seek(const int runlevel) __attribute__ ((unused));
++static const char *map_runlevel_to_location(const int runlevel);
++#ifndef SUSE
++static const int map_runlevel_to_lvl (const int runlevel);
++static const int map_runlevel_to_seek(const int runlevel);
++#endif /* not SUSE */
+
+ #ifndef INITDIR
+ # define INITDIR "/etc/init.d"
+@@ -1140,11 +1142,12 @@
+
+ #define RUNLEVLES (sizeof(runlevel_locations)/sizeof(runlevel_locations[0]))
+
+-static char *map_runlevel_to_location(const int runlevel)
++static const char *map_runlevel_to_location(const int runlevel)
+ {
+ return runlevel_locations[runlevel].location;
+ }
+
++#ifndef SUSE
+ static const int map_runlevel_to_lvl(const int runlevel)
+ {
+ return runlevel_locations[runlevel].lvl;
+@@ -1154,6 +1157,7 @@
+ {
+ return runlevel_locations[runlevel].seek;
+ }
++#endif /* not SUSE */
+
+ /*
+ * Scan current service structure
+@@ -1164,7 +1164,7 @@
+
+ pushd(path);
+ for (runlevel = 0; runlevel < RUNLEVLES; runlevel++) {
+- char * rcd = NULL;
++ const char * rcd = NULL;
+ DIR * rcdir;
+ struct dirent *d;
+ char * token;
+@@ -2134,7 +2134,7 @@
+ int order;
+ const char * script;
+ char nlink[PATH_MAX+1], olink[PATH_MAX+1];
+- char * rcd = NULL;
++ const char * rcd = NULL;
+ DIR * rcdir;
+
+ rcd = map_runlevel_to_location(runlevel);
+@@ -2280,7 +2280,7 @@
+ int lvl = 0, seek = 0;
+ const char * script;
+ char nlink[PATH_MAX+1], olink[PATH_MAX+1];
+- char * rcd = NULL;
++ const char * rcd = NULL;
+ DIR * rcdir;
+
+ rcd = map_runlevel_to_location(runlevel);
Propchange: trunk/src/insserv/debian/patches/35_fixunused.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/src/insserv/debian/patches/36_memleak.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/36_memleak.dpatch?rev=124&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/36_memleak.dpatch (added)
+++ trunk/src/insserv/debian/patches/36_memleak.dpatch Wed Sep 6 22:33:43 2006
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 36_memleak.dpatch by Petter Reinholdtsen <pere at hungry.com>
+
+Fix minor memleak. Patch sent upstream 2006-04-01.
+
+--- insserv-1.08.0.orig/insserv.c
++++ insserv-1.08.0/insserv.c
+@@ -1773,7 +1773,7 @@
+ }
+ if (!script_inf.default_start || script_inf.default_start == empty) {
+ if (guess->lvls)
+- script_inf.default_start = xstrdup(lvl2str(guess->lvls));
++ script_inf.default_start = lvl2str(guess->lvls);
+ }
+ } else {
+ /*
+@@ -1795,7 +1795,7 @@
+
+ list_for_each(req, &(cur->sort.req)) {
+ if (!strcmp(getreq(req)->serv, script_inf.provides)) {
+- script_inf.default_start = xstrdup(lvl2str(getserv(ptr)->lvls));
++ script_inf.default_start = lvl2str(getserv(ptr)->lvls);
+ break;
+ }
+ }
Propchange: trunk/src/insserv/debian/patches/36_memleak.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/src/insserv/debian/update-bootsystem-insserv
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/update-bootsystem-insserv?rev=124&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-bootsystem-insserv (original)
+++ trunk/src/insserv/debian/update-bootsystem-insserv Wed Sep 6 22:33:43 2006
@@ -45,5 +45,13 @@
echo "info: running insserv"
insserv -v
) > $logfile 2>&1
+
+ if grep -q 'There is a loop between' $logfile ; then
+ echo "error: Problems running insserv:"
+ grep 'There is a loop between' $logfile | sed 's/^/ /'
+ echo "info: Please check out this manually."
+
+ fi
+
echo "info: Use '$0 restore' to restore the old boot sequence."
fi
More information about the Initscripts-ng-commits
mailing list