Imported Debian patch 1.1.1~git-20070709-2

diff --git a/debian/changelog b/debian/changelog
index ee13fa5628000a8c938ce6645d19d6c6efa2bef3..4ff3cece88f41e690f7909a0bca4dbdd88fbefa8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nfs-utils (1:1.1.1~git-20070709-2) unstable; urgency=low
+
+  * 07-daemonize-instead-of-fork.patch: New patch from upstream, uses
+    daemon() instead of fork() and exit() for background mounts. Should
+    properly detach from the terminal and thus keep the kernel from SIGHUPing
+    mount during boot. (Closes: #144185, #156664)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat, 11 Aug 2007 09:27:53 +0200
+
 nfs-utils (1:1.1.1~git-20070709-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/patches/07-daemonize-instead-of-fork.patch b/debian/patches/07-daemonize-instead-of-fork.patch
new file mode 100644 (file)
index 0000000..5ae0f89
--- /dev/null
+++ b/debian/patches/07-daemonize-instead-of-fork.patch
@@ -0,0 +1,15 @@
+Index: nfs-utils-1.1.1~git-20070709/utils/mount/mount.c
+===================================================================
+--- nfs-utils-1.1.1~git-20070709.orig/utils/mount/mount.c
++++ nfs-utils-1.1.1~git-20070709/utils/mount/mount.c
+@@ -530,9 +530,7 @@ int main(int argc, char *argv[])
+                * Parent exits immediately with success.  Make
+                * sure not to free "mount_point"
+                */
+-              if (fork() > 0)
+-                      exit(0);
+-
++              daemon(0,0);
+               mnt_err = try_mount(spec, mount_point, flags, fs_type,
+                                       &extra_opts, mount_opts, fake,
+                                       nomtab, BACKGROUND);

diff --git a/debian/patches/series b/debian/patches/series
index 6ecb52c76497dcdd34fc5ec7ff8932d3eef57183..ec410b45d29eff499366ad366d4c26d83596001d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 02-document-debian-init-scripts.patch
 03-sm-notify-in-sbin.patch
 05-ignore-quota-option.patch
-06-gssd-manpage-typo.patch 
+06-gssd-manpage-typo.patch
+07-daemonize-instead-of-fork.patch