Imported Debian patch 1.1.0-9

diff --git a/debian/changelog b/debian/changelog
index 977bbbec844bf2c87774967aabd9ce86f0ed9263..4de04ec51d9a32475b49bf872ebcd3f2341e1648 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.1.0-9) unstable; urgency=low
+
+  * 04-umount-exit-status.patch: New patch, fixes the exit status from umount
+    so it's no longer inverted. (Closes: #432996)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat, 14 Jul 2007 11:15:24 +0200
+
 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

diff --git a/debian/patches/04-umount-exit-status.patch b/debian/patches/04-umount-exit-status.patch
new file mode 100644 (file)
index 0000000..bba5bfd
--- /dev/null
+++ b/debian/patches/04-umount-exit-status.patch
@@ -0,0 +1,20 @@
+mount.c seems to assume that nfsumount() uses standard C true/false
+return values, and inverts them for the exit status (where 0 is
+traditionally considered success). However, nfsumount() consistently
+seems to use 0 for success, and thus a success gets returned as exit
+status 1 and a failure as exit status 0. This confuses at least
+the GNOME drive manager applet, and probably others as well.
+
+Index: nfs-utils-1.1.0/utils/mount/mount.c
+===================================================================
+--- nfs-utils-1.1.0.orig/utils/mount/mount.c
++++ nfs-utils-1.1.0/utils/mount/mount.c
+@@ -371,7 +371,7 @@ int main(int argc, char *argv[])
+                       umount_usage();
+                       exit(1);
+               }
+-              exit(nfsumount(argc, argv) ? 0 : 1);
++              exit(nfsumount(argc, argv));
+       }
+ 
+       if(argv[1] && argv[1][0] == '-') {

diff --git a/debian/patches/series b/debian/patches/series
index 4d23d7f874cf7ee8723c28636551be7012901f15..cb97c491ca8cf35dac20260e553e565cef0e1a7c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+04-umount-exit-status.patch
 03-sm-notify-in-sbin.patch
 01-fix-hostent-memory-leak.diff
 02-document-debian-init-scripts.patch