-
Committer:
Package Import Robot
-
Author(s):
Steve Langasek
-
Date:
2014-01-13 21:13:11 UTC
-
mfrom:
(80.1.2 trunk)
-
Revision ID:
package-import@ubuntu.com-20140113211311-e5cngfhx8lirq0dc
Tags: 1:1.2.8-5ubuntu1
* 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.
- Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support.
- Depend on mountall (>= 2.41) to avoid deadlocks on boot.
- debian/nfs-common.default: always start idmapd automatically; drop
the configuration option.
- nfs-kernel-server.init: Unmount nfsd fs when init script stops
- Allow issuing options to rpc.nfsd
- Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs
due to EKEYEXPIRED error from kernel on ticket expiry.
* Dropped changes, included in Debian:
- Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs. This does not belong
in /var/lib.
- 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.