lp:~logan/ubuntu/quantal/nfs-utils/debian-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/quantal/nfs-utils at revision 59

Luke Yelavich (community): Approve on 2012-08-15

Ubuntu branches: Pending requested 2012-08-05

Diff: 4328 lines (+58/-3989)

29 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/01-sm-notify-in-sbin.patch/utils/statd/statd.c (+0/-493)
.pc/02-524255-manpages.patch/utils/exportfs/nfsd.man (+0/-206)
.pc/02-524255-manpages.patch/utils/nfsd/nfsd.man (+0/-105)
.pc/03-handle-mtab-symlink.patch/utils/mount/fstab.c (+0/-649)
.pc/03-handle-mtab-symlink.patch/utils/mount/fstab.h (+0/-31)
.pc/03-handle-mtab-symlink.patch/utils/mount/mount.c (+0/-550)
.pc/11-532048-reduce-verbosity.patch/utils/gssd/gss_util.c (+0/-341)
.pc/11-532048-reduce-verbosity.patch/utils/gssd/gssd_proc.c (+0/-1241)
.pc/16-mount.nfs.man-update-distinction-between-fstype.patch/utils/mount/mount.nfs.man (+0/-86)
.pc/17-multiarch-kerberos-paths.patch/aclocal/kerberos5.m4 (+0/-115)
.pc/18-osd_login-sbindir.patch/utils/osd_login/Makefile.am (+0/-12)
.pc/19-iscsiadm-path.patch/utils/osd_login/osd_login (+0/-118)
.pc/applied-patches (+0/-8)
aclocal/kerberos5.m4 (+0/-2)
debian/changelog (+27/-0)
debian/nfs-kernel-server.init (+7/-1)
utils/exportfs/nfsd.man (+0/-1)
utils/gssd/gss_util.c (+1/-1)
utils/gssd/gssd_proc.c (+3/-3)
utils/mount/fstab.c (+1/-1)
utils/mount/fstab.h (+0/-1)
utils/mount/mount.c (+0/-7)
utils/mount/mount.nfs.man (+4/-8)
utils/nfsd/nfsd.man (+0/-1)
utils/osd_login/Makefile.am (+8/-5)
utils/osd_login/osd_login (+4/-2)
utils/statd/statd.c (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

59. By Logan Rosen on 2012-08-05

* Merge from Debian unstable. Remaining changes:
  - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.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.
  - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support.
  - 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.
  - nfs-kernel-server.init: Unmount nfsd fs when init script stops
  - Allow issuing options to rpc.nfsd
  - debian/nfs-common.defaults: always start idmapd automatically; drop
    the configuration option.
  - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong
    in /var/lib.
* Iterate through exports.d to look for expors (Closes: #676604).

58. By Steve Langasek on 2012-06-22

releasing version 1:1.2.6-2ubuntu1

57. By Steve Langasek on 2012-06-22

Merge version 1:1.2.6-2 from Debian

56. By Steve Langasek on 2012-04-09

releasing version 1:1.2.5-3ubuntu3

55. By Steve Langasek on 2012-04-09

In some cases, /var/lib/nfs/rpc_pipefs is successfully unmounted on
upgrade but the directory still has contents within it. Since this is
/var/lib we shouldn't assume it's ok for delete these; instead, pass
--ignore-fail-on-non-empty to rmdir. LP: #954619.

54. By Steve Langasek on 2012-03-27

releasing version 1:1.2.5-3ubuntu2

53. By Steve Langasek on 2012-03-27

Fix wrong path to rpcinfo in the init script, which breaks use of nfs
v3 support in the server. LP: #945651.

52. By Steve Langasek on 2012-01-04

releasing version 1:1.2.5-3ubuntu1

51. By Steve Langasek on 2012-01-04

Merge version 1:1.2.5-3 from Debian testing

50. By Steve Langasek on 2011-10-30

releasing version 1:1.2.5-2ubuntu1