Imported Debian patch 1.1.0-8

diff --git a/debian/changelog b/debian/changelog
index e179219fe73cebac72b28ed3ac8f352be3253d97..977bbbec844bf2c87774967aabd9ce86f0ed9263 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nfs-utils (1:1.1.0-8) unstable; urgency=low
+
+  * Move nfs-common from 21 to 20 in the startup sequence, to make sure it's
+    started before nfs-kernel-server (since it's nfs-common that loads the
+    right kernel modules). Leave the shutdown sequence alone; no changes
+    should be needed to it. Also update the LSB dependency information to make
+    nfs-kernel-server depend on nfs-common. (Closes: #432818)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu, 12 Jul 2007 13:43:49 +0200
+

 nfs-utils (1:1.1.0-7) unstable; urgency=low
 
   * Add postinst fragment to make /sbin/mount setuid root, which should fix
 nfs-utils (1:1.1.0-7) unstable; urgency=low
 
   * Add postinst fragment to make /sbin/mount setuid root, which should fix

diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 7671c1578fef333d22169c4fd5e40e0d78b4ac2a..136ac9dbf00377bfe3a2053920a478b0c517602b 100644 (file)
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -7,7 +7,10 @@ case "$1" in
        ucf --three-way /usr/share/nfs-common/conffiles/idmapd.conf /etc/idmapd.conf
        ucf --three-way /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common
 
        ucf --three-way /usr/share/nfs-common/conffiles/idmapd.conf /etc/idmapd.conf
        ucf --three-way /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common
 

-       update-rc.d nfs-common defaults 21 79 >/dev/null
+        if [ "$2" != "" ] && dpkg --compare-versions "$2" lt 1:1.1.0-8; then
+            update-rc.d -f nfs-common remove >/dev/null
+       fi
+       update-rc.d nfs-common defaults 20 79 >/dev/null

 
        if ! getent passwd statd >/dev/null; then
            adduser --system --home /var/lib/nfs --no-create-home statd
 
        if ! getent passwd statd >/dev/null; then
            adduser --system --home /var/lib/nfs --no-create-home statd

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 91906ae8410ff7ab8c16b9436277d111b383d8ae..84f9c4dcb1d0fec982f3d001bd70cf0be714ce5f 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -2,7 +2,7 @@
 
 ### BEGIN INIT INFO
 # Provides:          nfs-kernel-server
 
 ### BEGIN INIT INFO
 # Provides:          nfs-kernel-server

-# Required-Start:    $portmap $time
+# Required-Start:    nfs-common $portmap $time

 # Required-Stop:     $portmap $time
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Required-Stop:     $portmap $time
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6