From: Steinar H. Gunderson <sesse@debian.org>
Date: Sat, 11 Aug 2007 07:27:53 +0000 (+0200)
Subject: Imported Debian patch 1.1.1~git-20070709-2
X-Git-Tag: debian/1%1.1.1_git-20070709-2^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3eb41ec41c081037e230934982804a93abe12610;p=nfs-utils.git

Imported Debian patch 1.1.1~git-20070709-2
---

diff --git a/debian/changelog b/debian/changelog
index ee13fa5..4ff3cec 100644
--- 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
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 6ecb52c..ec410b4 100644
--- 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