Merge lp:~ubuntu-branches/ubuntu/natty/nfs-utils/natty-201101190615 into lp:ubuntu/natty/nfs-utils

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/nfs-utils now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/nfs-utils/natty-201101190615. A merge should be performed if necessary.

Unmerged revisions

40. By Steve Langasek on 2011-01-19

roll back the gssd fixes; there's a race condition here as well where an NFS
'mounting' hook can be sent before local-filesystems is up, and we can't fix
that without deadlocking boot until mountall is fixed.

39. By Steve Langasek on 2011-01-19

debian/nfs-common.rpc_pipefs.upstart: instantiate this job separately for
gssd and idmapd, so that the filesystem gets mounted and unmounted
correctly even if both of gssd and idmapd aren't being run, or if one of
the two tries to start before the filesystem is fully mounted. Though
it may be simpler now to move this logic back into the gssd and idmapd
jobs directly, leave that for a later date.

38. By Steve Langasek on 2011-01-16

also fix the grouping in the start condition, so that restarts work
correctly when portmap is restarted.

37. By Steve Langasek on 2011-01-16

fix up another while loop syntax error

36. By Steve Langasek on 2011-01-16

(LP: #611397).
* debian/nfs-common.{gssd,statd}.upstart: pass a new WAITER= variable
to portmap-wait, so that multiple jobs can wait in parallel, fixing
another subtle race condition; and bump the portmap dependency again for
the necessary instance support.

35. By Steve Langasek on 2011-01-16

debian/nfs-common.gssd.upstart, debian/nfs-common.gssd-mounting.upstart,
debian/rules: refactor gssd startup to also wait on local-filesystems.
(LP: #611397). Note that this introduces a *new* race condition, since
only one job can call 'start portmap-wait' with the desired effect and
we now have two jobs that do so; so a further change to portmap-wait is
needed to let us run multiple instances of it.

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-18 17:45:45 +0000
+++ debian/changelog	2011-01-19 06:21:13 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 nfs-utils (1:1.2.2-4ubuntu3) natty; urgency=low
 
   * debian/nfs-common.statd.upstart: pass a new WAITER= variable
@@ -15,6 +16,25 @@
 
  -- Steve Langasek <[e-mail]>  Tue, 18 Jan 2011 17:45:45 -0800
 
+=======
+nfs-utils (1:1.2.2-4ubuntu3) UNRELEASED; urgency=low
+
+  * debian/nfs-common.statd.upstart: pass a new WAITER= variable
+    to portmap-wait, so that multiple jobs can wait in parallel, fixing
+    another subtle race condition; and bump the portmap dependency again for
+    the necessary instance support.
+  * also fix the grouping in the start condition, so that restarts work
+    correctly when portmap is restarted.
+  * debian/nfs-common.rpc_pipefs.upstart: instantiate this job separately for
+    gssd and idmapd, so that the filesystem gets mounted and unmounted
+    correctly even if both of gssd and idmapd aren't being run, or if one of
+    the two tries to start before the filesystem is fully mounted.  Though
+    it may be simpler now to move this logic back into the gssd and idmapd
+    jobs directly, leave that for a later date.
+
+ -- Steve Langasek <[e-mail]>  Sat, 15 Jan 2011 20:18:18 -0800
+
+>>>>>>> MERGE-SOURCE
 nfs-utils (1:1.2.2-4ubuntu2) natty; urgency=low
 
   * debian/nfs-common.statd.upstart,