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

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/natty/nfs-utils

Ubuntu branches: Pending requested 2011-01-19

Diff: 34 lines (+20/-0) (has conflicts)

1 file modified

debian/changelog (+20/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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.

34. By Steve Langasek on 2011-01-11

merge from Clint to fix bug #525154 at last - thanks, Clint!

33. By Lorenzo De Liso on 2010-12-15

* Merge from debian unstable (LP: #685860), remaining changes:
  - debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.upstart,
    debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm},
    debian/rules: drop nfs-common init script in favor of upstart jobs, and
    build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart init
    handling.
  - debian/control:
    + depend on the upstart-using version of portmap, 6.0-10ubuntu1; and
      drop the alternative depends on rpcbind, which hasn't been converted.
    + depend on portmap 6.0-10ubuntu1.
  - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common"
    in the postinst, this is redundant anyway and the nfs-common init script
    is gone now.

32. By Steve Langasek on 2010-06-04

releasing version 1:1.2.2-1ubuntu1

31. By Steve Langasek on 2010-06-04

merge version 1:1.2.2-1