From: Steinar H. Gunderson <sesse@debian.org>
Date: Thu, 12 Jul 2007 11:43:49 +0000 (+0200)
Subject: Imported Debian patch 1.1.0-8
X-Git-Tag: debian/1%1.1.0-8^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=3a11169202f9db0eb8b07612396e78ddbc5600f1

Imported Debian patch 1.1.0-8
---

diff --git a/debian/changelog b/debian/changelog
index e179219..977bbbe 100644
--- 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
diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 7671c15..136ac9d 100644
--- 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
 
-	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
diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 91906ae..84f9c4d 100644
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -2,7 +2,7 @@
 
 ### 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