From d6cef48b491086214014f912f4a0fed0c5f2e1fe Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Sun, 8 Jul 2007 17:09:11 -0600 Subject: [PATCH] v2.12r-18 --- debian/changelog | 7 +++++++ debian/patches/30nfs4-fix.dpatch | 25 ++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index b38132ea..1919530f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +util-linux (2.12r-18) unstable; urgency=low + + * Stop printing erroneous "rpc.idmapd appears to not be running" message. + Files: 30nfs4.dpatch. Closes: #385879 + + -- LaMont Jones Mon, 5 Feb 2007 13:47:10 -0700 + util-linux (2.12r-17) unstable; urgency=low * Userspace software suspend fix. Closes: #409365 diff --git a/debian/patches/30nfs4-fix.dpatch b/debian/patches/30nfs4-fix.dpatch index 8ac23bab..83b689a5 100755 --- a/debian/patches/30nfs4-fix.dpatch +++ b/debian/patches/30nfs4-fix.dpatch @@ -5,10 +5,21 @@ ## DP: No description. @DPATCH@ -diff -urNad 2.12r-11~/mount/nfs4mount.c 2.12r-11/mount/nfs4mount.c ---- 2.12r-11~/mount/nfs4mount.c 2006-09-19 09:29:41.000000000 -0600 -+++ 2.12r-11/mount/nfs4mount.c 2006-09-19 09:32:58.000000000 -0600 -@@ -367,7 +367,10 @@ +diff -urNad 2.12r-18~/mount/nfs4mount.c 2.12r-18/mount/nfs4mount.c +--- 2.12r-18~/mount/nfs4mount.c 2007-02-05 13:55:33.000000000 -0700 ++++ 2.12r-18/mount/nfs4mount.c 2007-02-05 13:56:06.000000000 -0700 +@@ -358,8 +358,9 @@ + + /* + * Give a warning if the rpc.idmapd daemon is not running ++ * The latest nfs-common doesn't create pid files at all. + */ +- idmapd_check(); ++ /* idmapd_check(); */ + + if (num_flavour == 0) + pseudoflavour[num_flavour++] = AUTH_UNIX; +@@ -367,7 +368,10 @@ /* * ditto with rpc.gssd daemon */ @@ -20,9 +31,9 @@ diff -urNad 2.12r-11~/mount/nfs4mount.c 2.12r-11/mount/nfs4mount.c } data.auth_flavourlen = num_flavour; data.auth_flavours = pseudoflavour; -diff -urNad 2.12r-11~/mount/nfsmount.c 2.12r-11/mount/nfsmount.c ---- 2.12r-11~/mount/nfsmount.c 2006-09-19 09:29:41.000000000 -0600 -+++ 2.12r-11/mount/nfsmount.c 2006-09-19 09:29:42.000000000 -0600 +diff -urNad 2.12r-18~/mount/nfsmount.c 2.12r-18/mount/nfsmount.c +--- 2.12r-18~/mount/nfsmount.c 2007-02-05 13:55:33.000000000 -0700 ++++ 2.12r-18/mount/nfsmount.c 2007-02-05 13:55:33.000000000 -0700 @@ -301,6 +301,7 @@ (xdrproc_t)xdr_void, (caddr_t)NULL, (xdrproc_t)xdr_void, (caddr_t)&clnt_res, -- 2.39.5