diff -Nru nfs-utils-1.2.8/debian/changelog nfs-utils-1.2.8/debian/changelog --- nfs-utils-1.2.8/debian/changelog 2016-04-06 14:49:00.000000000 +0000 +++ nfs-utils-1.2.8/debian/changelog 2016-08-31 07:37:51.000000000 +0000 @@ -1,3 +1,100 @@ +nfs-utils (1:1.2.8-9.1ubuntu1~ubuntu16.04.1~c42.ppa1) xenial; urgency=medium + + * No-change backport to xenial + + -- H.-Dirk Schmitt Wed, 31 Aug 2016 09:37:51 +0200 + +nfs-utils (1:1.2.8-9.1ubuntu1) yakkety; urgency=medium + + * Drop upstart jobs, upstart is not in yakkety any more. + * Drop libgssglue-dev build dep, --with-gssglue got dropped a while ago. + * Merge with Debian unstable. Remaining Ubuntu changes: + - debian/nfs-common.default: always start idmapd automatically; drop + the configuration option. + - Add 20-ticket-expired-error.patch: Add "-e" (ticket expiry is error) + option to rpc.gssd to prevent hangs due to EKEYEXPIRED error from kernel + on ticket expiry. (LP: #794112) + - Add 90-gss-free-lucid-sec-context.patch: adjust for changes to the ctx + argument of the serialize_krb5_ctx() function. (LP: #1331201) + - Add remove-gssproxy.patch: Drop gssproxy as it does not exist in Ubuntu + (LP: #1446851) + - Add a dependency on keyutils to nfs-common, so that idmapping will work + under systemd. (LP: #1449074) + - Add debian/nfs-common.maintscript: Clean up obsolete conffiles (upstart + jobs) on upgrades. This needs to be kept until after 18.04 LTS. + + -- Martin Pitt Thu, 28 Jul 2016 15:21:53 +0200 + +nfs-utils (1:1.2.8-9.1) unstable; urgency=medium + + Partial sync from ubuntu, included changes: + + [ Martin Pitt ] + * Add 00git-start-statd-systemd.patch: Latest start-statd script from + 1.3.2 to start rpc-statd.service under systemd. + * Add 23-systemd-pipefs_in_run.patch: systemd: Mount rpc_pipefs in /run instead of + /var/lib/nfs/, like in the upstart units. + * Add 24-systemd-daemon-paths.patch: Adjust program paths in systemd units. + * debian/nfs-kernel-server.links: Add nfs-kernel-server.service alias + symlink, to match SysV init script. + * Add 25-systemd-server-before-client.patch: Order NFS server before client, + to make mounting NFS shares from localhost work reliably. + * Add debian/nfs-utils_env.sh: Translate our /etc/default files into runtime + configuration for nfs-config.service. + * debian/nfs-{common,kernel-server}.install: Install systemd units. + * debian/rules: Enable/start systemd units. (LP: #1312976) + + * Add autopkgtest for installing server and client on localhost, setting up + two exports, rebooting, and ensuring that the NFS mounts work. + * Add 23-systemd-relax-dependencies.patch: Stop depending on basic.target in + the daemons which still do; i. e. add DefaultDependencies=no. This makes + it possible to run NFS during early boot, helps if you e. g. have /var + on NFS, and avoids dependency cycles with rcS init.d scripts which depend + on $remote_fs. (LP: #1428487) + * Shift number prefixes of other systemd patches accordingly, and adjust + them to the above patch. + + * 27-systemd-enable-with-systemctl-statd.patch: let the admin + enable/disable statd via systemd tools. (LP: #1428486) + * debian/rules: don't start statd by default (or it will trigger upstart + and systemd statd unit startup). + * debian/control, debian/*install: move nfs-utils.service to nfs-common + package. (LP: #1436304) + + [ Steve Langasek ] + * Add a dependency on keyutils to nfs-common, so that idmapping will work + under systemd. LP: #1449074. + + Followup changes to complement merge from ubuntu: + + [ Andreas Henriksson ] + * Restore anything related to nfs-common.init and nfs-common.default + * debian/nfs-common.links: Mask nfs-common init script with a symlink + to /dev/null to avoid using it under systemd. + * Explicitly set executable permissions on nfs-utils_env.sh helper + instead of relying on debian/nfs-utils_env.sh having correct + permissions in source directory. + + All of the above Closes: #796637 + + Additional changes while at it: + + [ Andreas Henriksson ] + * Make nfs-kernel-server depend on netbase since it needs /etc/services + for nfs-server to start (which is required for successful pkg install). + - Avoids "...unable to resolve ANYADDR:nfs to inet address: ..." + + [ Martin Pitt ] + * Drop obsolete versioned initscripts dependency. (Closes: #804990) + + -- Andreas Henriksson Tue, 28 Jun 2016 02:05:16 +0200 + +nfs-utils (1:1.2.8-9ubuntu13) yakkety; urgency=medium + + * Drop obsolete versioned initscripts dependency. (Closes: #804990) + + -- Martin Pitt Wed, 22 Jun 2016 16:09:37 +0200 + nfs-utils (1:1.2.8-9ubuntu12) xenial; urgency=medium * Drop gssproxy as it's not in Ubuntu (LP: #1446851) diff -Nru nfs-utils-1.2.8/debian/control nfs-utils-1.2.8/debian/control --- nfs-utils-1.2.8/debian/control 2015-07-27 08:37:22.000000000 +0000 +++ nfs-utils-1.2.8/debian/control 2016-07-28 13:31:48.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian kernel team Uploaders: Anibal Monsalve Salazar , Ben Hutchings , Steve Langasek -Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libgssglue-dev (>= 0.3), libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev (>= 0.2.4-2~), libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev, dh-systemd +Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev (>= 0.2.4-2~), libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev, dh-systemd Standards-Version: 3.9.0 Homepage: http://nfs.sourceforge.net/ Vcs-Git: git://git.debian.org/kernel/nfs-utils.git @@ -13,7 +13,7 @@ Package: nfs-kernel-server Priority: optional Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, lsb-base (>= 1.3-9ubuntu3), libtirpc1 (>= 0.2.4) +Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, netbase, lsb-base (>= 1.3-9ubuntu3), libtirpc1 (>= 0.2.4), keyutils Provides: knfs, nfs-server Conflicts: knfs, nfs-server Replaces: knfs, nfs-server @@ -33,13 +33,14 @@ Package: nfs-common Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind (>= 0.2.0-6ubuntu1), adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.10ubuntu1), libtirpc1 (>= 0.2.4), keyutils +Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), libtirpc1 (>= 0.2.4) + , keyutils Recommends: python Suggests: open-iscsi, watchdog Provides: nfs-client Conflicts: nfs-client -Breaks: nfs-kernel-server (<< 1:1.2.8-9ubuntu7~) -Replaces: nfs-client, nfs-kernel-server (<< 1:1.2.8-9ubuntu7~), mount (<< 2.13~) +Breaks: nfs-kernel-server (<< 1:1.2.8-6~) +Replaces: nfs-client, nfs-kernel-server (<< 1:1.2.8-6~), mount (<< 2.13~) Description: NFS support files common to client and server Use this package on any machine that uses NFS, either as client or server. Programs included: lockd, statd, showmount, nfsstat, gssd, diff -Nru nfs-utils-1.2.8/debian/nfs-common.gssd-mounting.upstart nfs-utils-1.2.8/debian/nfs-common.gssd-mounting.upstart --- nfs-utils-1.2.8/debian/nfs-common.gssd-mounting.upstart 2012-10-10 16:15:43.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-common.gssd-mounting.upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -# gssd-mounting - -description "Block the mounting event for NFS4 filesytems until gssd is running" -author "Steve Langasek " - -instance $MOUNTPOINT - -start on mounting TYPE=nfs* OPTIONS=*sec*krb5* -stop on started gssd or stopped gssd -task - -# This is required so that the task is still considered -# successful when it gets killed -normal exit TERM - -script - - DEFAULTFILE=/etc/default/nfs-common - - if [ -f "$DEFAULTFILE" ]; then - . "$DEFAULTFILE" - fi - - if [ -f /etc/fstab ]; then - exec 9<&0 " - -start on local-filesystems -stop on unmounted-remote-filesystems - -expect fork -respawn - -env DEFAULTFILE=/etc/default/nfs-common -env PIPEFS_MOUNTPOINT=/run/rpc_pipefs - -pre-start script - do_modprobe() { - modprobe -q "$1" || true - } - - if [ -f "$DEFAULTFILE" ]; then - . "$DEFAULTFILE" - fi - - # - # Parse the fstab file, and determine whether we need gssd. (The - # /etc/defaults settings, if any, will override our autodetection.) - # This code is partially adapted from the mountnfs.sh script in the - # sysvinit package. - - if [ -f /etc/fstab ]; then - exec 9<&0 " - -instance $MOUNTPOINT - -start on mounting TYPE=nfs* MOUNTPOINT!=/ -stop on started idmapd or stopped idmapd -task - -# This is required so that the task is still considered -# successful when it gets killed -normal exit TERM - -script - - status idmapd | grep -q "start/running" && exit 0 - - # If it's already starting we'll get killed by the impending 'stop on - # started idmapd' - # If it wasn't already starting, we'll either get killed by the stop - # on started or stopped. - # So, its safe to sleep forever here and rely on upstart to kill us, - - while sleep 3600; do :; done -end script diff -Nru nfs-utils-1.2.8/debian/nfs-common.idmapd.upstart nfs-utils-1.2.8/debian/nfs-common.idmapd.upstart --- nfs-utils-1.2.8/debian/nfs-common.idmapd.upstart 2012-10-10 16:15:43.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-common.idmapd.upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# idmapd - NFSv4 id <-> name mapper - -# rpc.idmapd is the NFSv4 ID <-> name mapping daemon. It provides -# functionality to the NFSv4 kernel client and server, to which it -# communicates via upcalls, by translating user and group IDs to names, and -# vice versa. - -description "NFSv4 id <-> name mapper" -author "Steve Langasek " - -start on local-filesystems -stop on unmounted-remote-filesystems - -expect fork -respawn - -env PIPEFS_MOUNTPOINT=/run/rpc_pipefs - -pre-start script - do_modprobe() { - modprobe -q "$1" || true - } - - do_modprobe nfs - do_modprobe nfsd - - do_modprobe sunrpc - - if ! mountpoint -q "$PIPEFS_MOUNTPOINT" - then - mkdir -p "$PIPEFS_MOUNTPOINT" - mount -t rpc_pipefs rpc_pipefs "$PIPEFS_MOUNTPOINT" || true - fi -end script - -exec rpc.idmapd - -post-stop script - if mountpoint -q "$PIPEFS_MOUNTPOINT" - then - # ignore any failures caused by the filesystem still - # being in use - umount "$PIPEFS_MOUNTPOINT" || true - fi -end script - diff -Nru nfs-utils-1.2.8/debian/nfs-common.install nfs-utils-1.2.8/debian/nfs-common.install --- nfs-utils-1.2.8/debian/nfs-common.install 2015-04-27 15:44:03.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-common.install 2016-06-27 21:13:41.000000000 +0000 @@ -29,5 +29,3 @@ systemd/nfs-idmapd.service /lib/systemd/system systemd/nfs-client.target /lib/systemd/system systemd/nfs-utils.service /lib/systemd/system -debian/statd.override /etc/init/ -debian/statd-mounting.override /etc/init/ diff -Nru nfs-utils-1.2.8/debian/nfs-common.links nfs-utils-1.2.8/debian/nfs-common.links --- nfs-utils-1.2.8/debian/nfs-common.links 2015-08-28 08:07:57.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-common.links 2016-06-27 21:13:41.000000000 +0000 @@ -3,5 +3,4 @@ usr/share/man/man8/idmapd.8 usr/share/man/man8/rpc.idmapd.8 usr/share/man/man8/sm-notify.8 usr/share/man/man8/rpc.sm-notify.8 usr/share/man/man8/svcgssd.8 usr/share/man/man8/rpc.svcgssd.8 -/lib/systemd/system/rpc-gssd.service lib/systemd/system/gssd.service -/dev/null lib/systemd/system/idmapd.service +/dev/null /lib/systemd/system/nfs-common.service diff -Nru nfs-utils-1.2.8/debian/nfs-common.maintscript nfs-utils-1.2.8/debian/nfs-common.maintscript --- nfs-utils-1.2.8/debian/nfs-common.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-common.maintscript 2016-07-28 13:41:00.000000000 +0000 @@ -0,0 +1,9 @@ +rm_conffile /etc/init/statd.override 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/statd.conf 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/statd-mounting.override 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/statd-mounting.conf 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/idmapd.conf 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/idmapd-mounting.conf 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/gssd.conf 1:1.2.8-9.1ubuntu1~ +rm_conffile /etc/init/gssd-mounting.conf 1:1.2.8-9.1ubuntu1~ + diff -Nru nfs-utils-1.2.8/debian/nfs-common.postinst nfs-utils-1.2.8/debian/nfs-common.postinst --- nfs-utils-1.2.8/debian/nfs-common.postinst 2015-04-27 15:44:03.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-common.postinst 2014-08-13 00:12:43.000000000 +0000 @@ -2,23 +2,15 @@ set -e -finish_rm_conffile() { - local CONFFILE="$1" - - if [ -e "$CONFFILE.dpkg-backup" ]; then - mv -f "$CONFFILE.dpkg-backup" "$CONFFILE.dpkg-bak" - fi - if [ -e "$CONFFILE.dpkg-remove" ]; then - echo "Removing obsolete conffile $CONFFILE ..." - rm -f "$CONFFILE.dpkg-remove" - fi -} - case "$1" in configure) ucf --three-way /usr/share/nfs-common/conffiles/idmapd.conf /etc/idmapd.conf ucf --three-way /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common + if [ "$2" != "" ] && dpkg --compare-versions "$2" lt 1:1.1.0-10; then + update-rc.d -f nfs-common remove >/dev/null + fi + if ! getent passwd statd >/dev/null; then adduser --system --home /var/lib/nfs --no-create-home statd fi @@ -42,47 +34,11 @@ fi fi - if dpkg --compare-versions "$2" lt-nl 1:1.2.0-2ubuntu1 - then - if [ -e /etc/init.d/nfs-common.dpkg-remove ] - then - invoke-rc.d nfs-common.dpkg-remove stop - elif [ -e /etc/init.d/nfs-common.dpkg-backup ] - then - invoke-rc.d nfs-common.dpkg-backup stop - fi - update-rc.d nfs-common remove - elif dpkg --compare-versions "$2" lt-nl 1:1.2.4-1ubuntu3 - then - # handle the move of rpc_pipefs from /var/lib to /run - invoke-rc.d idmapd stop - invoke-rc.d gssd stop - if [ -d /var/lib/nfs/rpc_pipefs ]; then - rmdir --ignore-fail-on-non-empty /var/lib/nfs/rpc_pipefs - fi - fi - # Migrate /lib/init/rw/sendsigs.omit.statd to /run. if [ -f /lib/init/rw/sendsigs.omit.d/statd ]; then mv /lib/init/rw/sendsigs.omit.d/statd /run/sendsigs.omit.d/statd fi - - # Remove enablement flag in conffile - DEFAULT_CONFFILE=/etc/default/nfs-common - if [ -f ${DEFAULT_CONFFILE}.statd.enable ]; then - # enable upstart and systemd jobs. Ignore errors as name mapping isn't one to one - # upstart jobs are not disabled under systemd by update-rc.d wihout sysvinit file. - sed -i 's/manual//' /etc/init/statd-mounting.override 2>/dev/null || true - if [ `stat -c%s /etc/init/whoopsie.override` -eq 0 ]; then - rm -f /etc/init/statd-mounting.override /etc/init/statd.override - fi - update-rc.d rpc-statd-notify enable >/dev/null 2>&1 || true - update-rc.d rpc-statd enable >/dev/null 2>&1 || true - rm -f ${DEFAULT_CONFFILE}.statd.enable - fi ;; esac #DEBHELPER# - -finish_rm_conffile /etc/init.d/nfs-common diff -Nru nfs-utils-1.2.8/debian/nfs-common.preinst nfs-utils-1.2.8/debian/nfs-common.preinst --- nfs-utils-1.2.8/debian/nfs-common.preinst 2015-04-27 15:44:03.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-common.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -#!/bin/sh - -set -e - -prepare_rm_conffile() { - local CONFFILE="$1" - local PACKAGE="$2" - - [ -e "$CONFFILE" ] || return 0 - - local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')" - local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PACKAGE | \ - sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")" - if [ "$md5sum" != "$old_md5sum" ]; then - echo "Obsolete conffile $CONFFILE has been modified by you." - echo "Saving as $CONFFILE.dpkg-bak ..." - mv -f "$CONFFILE" "$CONFFILE.dpkg-backup" - else - echo "Moving obsolete conffile $CONFFILE out of the way..." - mv -f "$CONFFILE" "$CONFFILE.dpkg-remove" - fi -} - -# remove the obsolete init script (replaced by an upstart job) -if [ "$1" = install ] || [ "$1" = upgrade ]; then - if [ -e "/etc/init.d/nfs-common" ] && [ ! -L "/etc/init.d/nfs-common" ]; then - prepare_rm_conffile /etc/init.d/nfs-common nfs-common - fi -fi - -# Prepare removal of enablement flag in conffile. -DEFAULT_CONFFILE=/etc/default/nfs-common -if [ "$1" = upgrade ]; then - if dpkg --compare-versions "$2" lt-nl 1:1.2.8-9ubuntu7 && [ -f $DEFAULT_CONFFILE ]; then - if egrep -sqi 'NEED_STATD="?yes' $DEFAULT_CONFFILE; then - touch ${DEFAULT_CONFFILE}.statd.enable - fi - sed -i '/#.*statd daemon/d' /etc/default/nfs-common - sed -i '/NEED_STATD/d' /etc/default/nfs-common - fi -fi - -#DEBHELPER# diff -Nru nfs-utils-1.2.8/debian/nfs-common.statd-mounting.upstart nfs-utils-1.2.8/debian/nfs-common.statd-mounting.upstart --- nfs-utils-1.2.8/debian/nfs-common.statd-mounting.upstart 2015-04-27 15:44:03.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-common.statd-mounting.upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -# statd-mounting - -description "Block the mounting event for NFS filesytems until statd is running" -author "Clint Byrum " - -instance $MOUNTPOINT - -start on mounting TYPE=nfs -stop on started statd or stopped statd -task - -# This is required so that the task is still considered -# successful when it gets killed -normal exit 2 - -script - - . /etc/default/nfs-common - - status statd | grep -q "start/running" && exit 0 - - # If its already starting we'll get killed by the impending 'stop on - # started statd' - # If it wasn't already starting, we'll either get killed by the stop - # on started or stopped. - # So, its safe to sleep forever here and rely on upstart to kill us, - - while sleep 3600; do :; done -end script diff -Nru nfs-utils-1.2.8/debian/nfs-common.statd.upstart nfs-utils-1.2.8/debian/nfs-common.statd.upstart --- nfs-utils-1.2.8/debian/nfs-common.statd.upstart 2015-04-27 15:44:03.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-common.statd.upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -# statd - NSM status monitor - -description "NSM status monitor" -author "Steve Langasek " - -# ON_BOOT is set to y in rpcbind's special rpcbind-boot.conf -# It will not be set when users run 'restart rpcbind' or 'start rpcbind' -# This is so that we don't start until we have local filesystems on -# bootup but we also restart whenever rpcbind is restarted. -Clint Byrum -# -# The case where we need to make sure statd is started on mounting -# TYPE=nfs is handled in the "statd-mounting" job. -# -start on (started rpcbind ON_BOOT= - or (virtual-filesystems and started rpcbind ON_BOOT=y)) -stop on stopping rpcbind - -expect fork -respawn - -env DEFAULTFILE=/etc/default/nfs-common - -pre-start script - if [ -f "$DEFAULTFILE" ]; then - . "$DEFAULTFILE" - fi - - logger -t statd-pre-start "$UPSTART_EVENTS" || true - echo UPSTART_EVENTS = "$UPSTART_EVENTS" - - exec sm-notify -end script - -script - if [ -f "$DEFAULTFILE" ]; then - . "$DEFAULTFILE" - fi - - if [ "x$NEED_STATD" != xno ]; then - exec rpc.statd -L $STATDOPTS - fi -end script diff -Nru nfs-utils-1.2.8/debian/nfs-kernel-server.default nfs-utils-1.2.8/debian/nfs-kernel-server.default --- nfs-utils-1.2.8/debian/nfs-kernel-server.default 2014-08-11 08:00:01.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-kernel-server.default 2014-08-13 00:12:43.000000000 +0000 @@ -6,7 +6,7 @@ # Options for rpc.mountd. # If you have a port-based firewall, you might want to set up -# a fixed port here using the --port option. For more information, +# a fixed port here using the --port option. For more information, # see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS # To disable NFSv4 on the server, specify '--no-nfs-version 4' here RPCMOUNTDOPTS="--manage-gids" @@ -17,6 +17,3 @@ # Options for rpc.svcgssd. RPCSVCGSSDOPTS="" - -# Options for rpc.nfsd. -RPCNFSDOPTS="" diff -Nru nfs-utils-1.2.8/debian/nfs-kernel-server.init nfs-utils-1.2.8/debian/nfs-kernel-server.init --- nfs-utils-1.2.8/debian/nfs-kernel-server.init 2014-08-11 08:00:01.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-kernel-server.init 2014-08-13 00:12:43.000000000 +0000 @@ -2,8 +2,8 @@ ### BEGIN INIT INFO # Provides: nfs-kernel-server -# Required-Start: $remote_fs $portmap $time -# Required-Stop: $remote_fs $portmap $time +# Required-Start: $remote_fs nfs-common $portmap $time +# Required-Stop: $remote_fs nfs-common $portmap $time # Should-Start: $named # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 @@ -30,7 +30,6 @@ RPCMOUNTDOPTS= NEED_SVCGSSD=no RPCSVCGSSDOPTS= -RPCNFSDOPTS= PROCNFSD_MOUNTPOINT=/proc/fs/nfsd if [ -f $DEFAULTFILE ]; then . $DEFAULTFILE @@ -76,7 +75,7 @@ log_warning_msg "Not starting $DESC: no support in current kernel." exit 0 fi - + do_mount nfsd $PROCNFSD_MOUNTPOINT || NEED_SVCGSSD=no log_begin_msg "Exporting directories for $DESC..." $PREFIX/sbin/exportfs -r @@ -89,7 +88,7 @@ log_daemon_msg "Starting $DESC" log_progress_msg "nfsd" - + # See if rpcbind is running $PREFIX/sbin/rpcinfo -p >/dev/null 2>&1 RET=$? @@ -101,7 +100,7 @@ start-stop-daemon --start --oknodo --quiet \ --nicelevel $RPCNFSDPRIORITY \ - --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDOPTS $RPCNFSDCOUNT + --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT RET=$? if [ $RET != 0 ]; then log_end_msg $RET @@ -193,7 +192,6 @@ if mountpoint -q $PROCNFSD_MOUNTPOINT then $PREFIX/sbin/exportfs -f - umount $PROCNFSD_MOUNTPOINT fi ;; diff -Nru nfs-utils-1.2.8/debian/rules nfs-utils-1.2.8/debian/rules --- nfs-utils-1.2.8/debian/rules 2015-11-24 08:39:53.000000000 +0000 +++ nfs-utils-1.2.8/debian/rules 2016-06-27 21:13:41.000000000 +0000 @@ -56,12 +56,7 @@ dh_installdocs -pnfs-common debian/README.Debian.nfsv4 dh_systemd_enable -p nfs-common nfs-client.target dh_systemd_enable -p nfs-kernel-server nfs-server.service - dh_installinit -pnfs-common --no-start -R --name statd - dh_installinit -pnfs-common --no-start --name statd-mounting - dh_installinit -pnfs-common -R --name gssd - dh_installinit -pnfs-common --no-start --name gssd-mounting - dh_installinit -pnfs-common -R --name idmapd - dh_installinit -pnfs-common --no-start --name idmapd-mounting + dh_installinit -pnfs-common -R dh_systemd_start -p nfs-common --restart-after-upgrade nfs-utils.service dh_systemd_start -p nfs-kernel-server --restart-after-upgrade nfs-server.service install -m 0755 debian/nfs-kernel-server.init debian/nfs-kernel-server/etc/init.d/nfs-kernel-server @@ -76,6 +71,7 @@ dh_strip dh_compress dh_fixperms + chmod +x debian/nfs-common/usr/lib/systemd/scripts/nfs-utils_env.sh chmod u+s debian/nfs-common/sbin/mount.nfs dh_installdeb dh_shlibdeps diff -Nru nfs-utils-1.2.8/debian/statd-mounting.override nfs-utils-1.2.8/debian/statd-mounting.override --- nfs-utils-1.2.8/debian/statd-mounting.override 2015-04-27 15:44:03.000000000 +0000 +++ nfs-utils-1.2.8/debian/statd-mounting.override 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -manual diff -Nru nfs-utils-1.2.8/debian/statd.override nfs-utils-1.2.8/debian/statd.override --- nfs-utils-1.2.8/debian/statd.override 2015-04-27 15:44:03.000000000 +0000 +++ nfs-utils-1.2.8/debian/statd.override 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -manual