From: Anibal Monsalve Salazar <anibal@debian.org>
Date: Tue, 29 May 2007 10:38:36 +0000 (+1000)
Subject: Imported Debian patch 1.1.0-3
X-Git-Tag: debian/1%1.1.0-3^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=5ec394580c68dfe57bc973406391b84b3be6e8af

Imported Debian patch 1.1.0-3
---

diff --git a/debian/changelog b/debian/changelog
index 56808d6..6a72d5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.1.0-3) unstable; urgency=low
+
+  * Fixed "nfs-common - fails to install without /etc/fstab".
+    Closes: #426508.
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Tue, 29 May 2007 20:38:36 +1000
+
 nfs-utils (1:1.1.0-2) unstable; urgency=low
 
   * Make sure rpcsec_gss_krb5 is loaded if needed in nfs-kernel-server. It
diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index c6b0a9a..7cba679 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -36,21 +36,23 @@ fi
 AUTO_NEED_IDMAPD=no
 AUTO_NEED_GSSD=no
 
-exec 9<&0 </etc/fstab
+if [ -f /etc/fstab ]; then
+    exec 9<&0 </etc/fstab
 
-while read DEV MTPT FSTYPE OPTS REST
-do
-    if [ "$FSTYPE" = "nfs4" ]; then
-        AUTO_NEED_IDMAPD=yes
-    fi
-    case "$OPTS" in
-        sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
-	    AUTO_NEED_GSSD=yes
-	;;
-    esac
-done
-
-exec 0<&9 9<&-
+    while read DEV MTPT FSTYPE OPTS REST
+    do
+        if [ "$FSTYPE" = "nfs4" ]; then
+            AUTO_NEED_IDMAPD=yes
+        fi
+        case "$OPTS" in
+            sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
+    	    AUTO_NEED_GSSD=yes
+            ;;
+        esac
+    done
+
+    exec 0<&9 9<&-
+fi
 
 #
 # We also need idmapd if we run an NFSv4 server. It's fairly difficult