[Pkg-sysvinit-commits] r1013 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2006-10-06 17:31:15 +0000 (Fri, 06 Oct 2006)
New Revision: 1013

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
   sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
Log:
  * Let initscripts conflict with udev << 0.080-1, and stop calling
    mountdevsub.sh from mtab.sh. (Closes: #391312)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-10-06 17:28:40 UTC (rev 1012)
+++ sysvinit/trunk/debian/changelog	2006-10-06 17:31:15 UTC (rev 1013)
@@ -2,6 +2,8 @@
 
   * Do not insert /dev/.static/dev in /etc/mtab, and do not try to
     umount it either.  Avoids confusing users. (Closes: #391122)
+  * Let initscripts conflict with udev << 0.080-1, and stop calling
+    mountdevsub.sh from mtab.sh. (Closes: #391312)
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri,  6 Oct 2006 17:21:27 +0200
 

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2006-10-06 17:28:40 UTC (rev 1012)
+++ sysvinit/trunk/debian/control	2006-10-06 17:31:15 UTC (rev 1013)
@@ -47,7 +47,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${glibc:Depends}, ${mount:Depends}, e2fsprogs (>= 1.32+1.33-WIP-2003.04.14-1), debianutils (>= 2.13.1), lsb-base (>= 3.0-6), sysvinit-utils
 Recommends: psmisc
-Conflicts: mdutils, sysv-rc (<< 2.86.ds1-1.2), sysvinit (<< 2.86.ds1-12)
+Conflicts: mdutils, sysv-rc (<< 2.86.ds1-1.2), sysvinit (<< 2.86.ds1-12), udev (<< 0.080-1)
 Replaces: mdutils, sysvinit (<< 2.85-12), libc6, libc6.1, libc0.1, libc0.3
 Description: Scripts for initializing and shutting down the system
  The scripts in this package initialize a standard Debian

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-10-06 17:28:40 UTC (rev 1012)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-10-06 17:31:15 UTC (rev 1013)
@@ -15,11 +15,6 @@
 # the fact that virtual filesystems were mounted early on, before mtab
 # was writable.
 #
-# In addition, this script currently has to run mountdevsubfs.sh too
-# because in versions of the udev package prior to 0.080-1, the "udev"
-# initscript ran at S04udev (_after_ S04mountdevsubfs.sh) and unmounted
-# /dev/pts and /dev/shm.
-#
 
 PATH=/lib/init:/sbin:/bin
 . /lib/init/vars.sh
@@ -167,9 +162,6 @@
 
 case "$1" in
   start|"")
-        # Can't source, as it seem to terminate this script too early if I do.
-	/etc/init.d/mountdevsubfs.sh start
-
 	do_start
 	;;
   restart|reload|force-reload)