[Initscripts-ng-commits] r475 - in /trunk/src/insserv/debian: changelog control patches/31_debian_conf.dpatch patches/50_mountoverflowtmp-localfs.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Mon Jan  7 22:33:15 2008
New Revision: 475

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=475
Log:
Revert mountoverflowtmp patch, to make it possible to upload insserv before the new initscripts package is available.

Added:
    trunk/src/insserv/debian/patches/50_mountoverflowtmp-localfs.dpatch
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/control
    trunk/src/insserv/debian/patches/31_debian_conf.dpatch

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=475&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Mon Jan  7 22:33:15 2008
@@ -4,10 +4,6 @@
     - Updated patches 10_nosuse, 20_path_at_runtime, 21_overrides and
       43_shutdown to apply on the new version.
     - Removed patch 11_revdepend as it is included upstream.
-  * Add mountoverflowtmp to virtual facility $local_fs, to make sure
-    /tmp/ is always mounted before the scripts needing /tmp/ is
-    started.  Conflict with initscripts before 2.86.ds1-48, to avoid a
-    dependency loop with this change.
   * In graphs, name scripts without provides header, and scripts
     without LSB header, using the name of the file in /etc/init.d/.
     This make it easier to spot loops involving these scripts.

Modified: trunk/src/insserv/debian/control
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/control?rev=475&op=diff
==============================================================================
--- trunk/src/insserv/debian/control (original)
+++ trunk/src/insserv/debian/control Mon Jan  7 22:33:15 2008
@@ -11,7 +11,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, sysv-rc
 Suggests: bootchart
-Conflict: initscripts (<< 2.86.ds1-48)
 Description: Reorder boot sequence based on LSB init.d script dependencies
  Reorder the boot order based on init.d script dependencies as
  documented in LSB comment headers in the script or in override files

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=475&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/31_debian_conf.dpatch (original)
+++ trunk/src/insserv/debian/patches/31_debian_conf.dpatch Mon Jan  7 22:33:15 2008
@@ -15,7 +15,7 @@
  # All local filesystems are mounted (done during boot phase)
  #
 -$local_fs	boot.localfs
-+$local_fs	+mountall +mountoverflowtmp +umountfs
++$local_fs	+mountall +umountfs
  
  #
  # Low level networking (ethernet card)

Added: trunk/src/insserv/debian/patches/50_mountoverflowtmp-localfs.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/50_mountoverflowtmp-localfs.dpatch?rev=475&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/50_mountoverflowtmp-localfs.dpatch (added)
+++ trunk/src/insserv/debian/patches/50_mountoverflowtmp-localfs.dpatch Mon Jan  7 22:33:15 2008
@@ -1,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_mountoverflowtmp-localfs.dpatch by Petter Reinholdtsen
+
+   * Add mountoverflowtmp to virtual facility $local_fs, to make sure
+     /tmp/ is always mounted before the scripts needing /tmp/ is
+     started.  Conflict with initscripts before 2.86.ds1-48, to avoid a
+     dependency loop with this change.
+
+ at DPATCH@
+Index: debian/control
+===================================================================
+--- debian/control	(revision 470)
++++ debian/control	(working copy)
+@@ -11,6 +11,7 @@
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}, sysv-rc
+ Suggests: bootchart
++Conflict: initscripts (<< 2.86.ds1-48)
+ Description: Reorder boot sequence based on LSB init.d script dependencies
+  Reorder the boot order based on init.d script dependencies as
+  documented in LSB comment headers in the script or in override files
+Index: debian/patches/31_debian_conf.dpatch
+===================================================================
+--- debian/patches/31_debian_conf.dpatch	(revision 470)
++++ debian/patches/31_debian_conf.dpatch	(working copy)
+@@ -15,7 +15,7 @@
+  # All local filesystems are mounted (done during boot phase)
+  #
+ -$local_fs	boot.localfs
+-+$local_fs	+mountall +umountfs
+++$local_fs	+mountall +mountoverflowtmp +umountfs
+  
+  #
+  # Low level networking (ethernet card)