From: Steinar H. Gunderson Date: Sat, 14 Jul 2007 09:15:24 +0000 (+0200) Subject: Imported Debian patch 1.1.0-9 X-Git-Tag: debian/1%1.1.0-9^0 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=089e41fa4ca7123113984b1867ee5f22571e9bee;p=nfs-utils.git Imported Debian patch 1.1.0-9 --- diff --git a/debian/changelog b/debian/changelog index 977bbbe..4de04ec 100644 --- 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 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 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 4d23d7f..cb97c49 100644 --- 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