-
Committer:
Package Import Robot
-
Author(s):
Steve Langasek
-
Date:
2013-11-21 13:35:20 UTC
-
mfrom:
(13.1.1 experimental)
-
Revision ID:
package-import@ubuntu.com-20131121133520-gu3lfbwbfe88yv4j
Tags: 1:1.2.8-4ubuntu1
* 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-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.
- Add "-e" (ticket expiry is error) option to rpc.gssd to prevent hangs due
to EKEYEXPIRED error from kernel on ticket expiry. LP: #794112
- Fix the stop conditions: never stop on 'runlevel [06]' since that gives
the system no time to cleanly unmount nfs mounts; instead, stop only on
the unmounted-remote-filesystems event. LP: #569094.
* Dropped changes:
- build-depend on debhelper (>= 7.3.15ubuntu3): all supported debhelper
versions meet this requirement now, so it's not worth carrying a delta
for.
* Drop removal handling for rpc_pipefs.conf, which has been obsolete since
before the 12.04 release.