- move blkmapd, idmapd, statd and gssd to /sbin which allows us to remove

  chicken-egg hacks for possible /usr mounts

Changed files:
    blkmapd.init -> 1.2
    nfs-blkmapd.service -> 1.2
    nfs-gssd.service -> 1.2
    nfs-idmapd.service -> 1.2
    nfs-utils.spec -> 1.221
    nfsfs.init -> 1.45
    nfslock.init -> 1.26
    rpcgssd.init -> 1.13
    rpcidmapd.init -> 1.20

diff --git a/blkmapd.init b/blkmapd.init
index 9386f0f332084497ea04e8ae6aff144c385f74c9..1ec4d52d10ae12bb17c50fd65aebd34be1c58fd4 100644 (file)
--- a/blkmapd.init
+++ b/blkmapd.init
@@ -41,7 +41,7 @@ start() {
                        mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
        fi
        msg_starting "pNFS block layout mapping daemon"
-       daemon /usr/sbin/blkmapd $BLKMAPDOPTIONS
+       daemon /sbin/blkmapd $BLKMAPDOPTIONS
        RETVAL=$?
        [ $RETVAL = 0 ] && touch /var/lock/subsys/blkmapd
 }

diff --git a/nfs-blkmapd.service b/nfs-blkmapd.service
index ffcfd13c2058a10b62a2720287c8158ddba144aa..95c8e7fa5efeed9e995afa11c7e04373872bf26b 100644 (file)
--- a/nfs-blkmapd.service
+++ b/nfs-blkmapd.service
@@ -7,7 +7,7 @@ Requires=var-lib-nfs-rpc_pipefs.mount
 Type=forking
 StandardError=syslog+console
 EnvironmentFile=-/etc/sysconfig/nfsfs
-ExecStart=/usr/sbin/blkmapd $BLKMAPDOPTIONS
+ExecStart=/sbin/blkmapd $BLKMAPDOPTIONS
 
 [Install]
 WantedBy=multi-user.target

diff --git a/nfs-gssd.service b/nfs-gssd.service
index a93eed0a2c42587efbb1922af14f734d1ced9b3b..999af099d04f86bcd2545333e2010fb3a601f21b 100644 (file)
--- a/nfs-gssd.service
+++ b/nfs-gssd.service
@@ -7,7 +7,7 @@ After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-idmapd.service
 Type=forking
 StandardError=syslog+console
 EnvironmentFile=-/etc/sysconfig/nfsfs
-ExecStart=/usr/sbin/rpc.gssd $RPCGSSOPTIONS
+ExecStart=/sbin/rpc.gssd $RPCGSSOPTIONS
 
 [Install]
 WantedBy=multi-user.target

diff --git a/nfs-idmapd.service b/nfs-idmapd.service
index 85f3907bad0a8339846d224142de0af5f602c7f3..9a2d4131226c4cd9c743e780125e3436435ad647 100644 (file)
--- a/nfs-idmapd.service
+++ b/nfs-idmapd.service
@@ -8,7 +8,7 @@ Type=forking
 StandardError=syslog+console
 EnvironmentFile=-/etc/sysconfig/nfsfs
 EnvironmentFile=-/etc/sysconfig/nfsd
-ExecStart=/usr/sbin/rpc.idmapd $RPCIDMAPOPTIONS
+ExecStart=/sbin/rpc.idmapd $RPCIDMAPOPTIONS
 
 [Install]
 WantedBy=multi-user.target

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 7258f886bd4a49ef83d1bbb7ab1d8200b9ce1505..8601a2910b7f93a79814e9af255c27c2f035c624 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -81,6 +81,7 @@ Requires(post):       fileutils
 Requires(post):        sed >= 4.0
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-common = %{version}-%{release}
+Requires:      libevent >= 2.0.14-2
 Requires:      rc-scripts >= 0.4.1.5
 Requires:      rpcbind >= 0.1.7
 Requires:      setup >= 2.4.6-7
@@ -184,7 +185,7 @@ Provides:   user(rpcstatd)
 Provides:      group(rpcstatd)
 Provides:      nfslockd
 Provides:      nfs-utils-lock
-Requires:      libnfsidmap >= 0.21-3
+Requires:      libnfsidmap >= 0.25-3
 Requires:      rc-scripts
 Requires:      rpcbind >= 0.1.7
 Obsoletes:     nfs-utils-lock
@@ -245,7 +246,7 @@ Jednostki systemd dla wspólnych serwisów NFS.
        --with-statdpath=/var/lib/nfs/statd \
        --with-statedir=/var/lib/nfs \
        --with-statduser=rpcstatd \
-       --with-start-statd=%{_sbindir}/start-statd \
+       --with-start-statd=/sbin/start-statd \
        --with-tcp-wrappers \
        --with-krb5
 
@@ -262,17 +263,20 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig,exports.d} \
 
 install -p utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc
 
-cat >$RPM_BUILD_ROOT%{_sbindir}/start-statd <<EOF
+cat >$RPM_BUILD_ROOT/sbin/start-statd <<EOF
 #!/bin/sh
 # mount.nfs calls this script when mounting a filesystem with locking
 # enabled, but when statd does not seem to be running (based on
 # /var/run/rpc.statd.pid).
-exec /sbin/service nfslock start
+exec /sbin/rpc.statd --no-notify
 EOF
 
-sed -e "s|#!/bin/bash|#!/bin/sh|" utils/gssd/gss_destroy_creds > $RPM_BUILD_ROOT%{_sbindir}/gss_destroy_creds
+%{__sed} -i -e "s|#!/bin/bash|#!/bin/sh|" $RPM_BUILD_ROOT%{_sbindir}/gss_destroy_creds
+%{__sed} -i -e 's|%{_sbindir}nfsidmap|/sbin/nfsidmap|g' $RPM_BUILD_ROOT%{_mandir}/man8/nfsidmap.8
 
-mv $RPM_BUILD_ROOT%{_sbindir}/rpcdebug $RPM_BUILD_ROOT/sbin
+for f in rpcdebug blkmapd nfsidmap rpc.gssd rpc.idmapd rpc.statd ; do
+       mv $RPM_BUILD_ROOT%{_sbindir}/$f $RPM_BUILD_ROOT/sbin
+done
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
@@ -503,10 +507,10 @@ fi
 %attr(4755,root,root) /sbin/umount.nfs
 %attr(4755,root,root) /sbin/mount.nfs4
 %attr(4755,root,root) /sbin/umount.nfs4
-%attr(755,root,root) %{_sbindir}/blkmapd
+%attr(755,root,root) /sbin/blkmapd
+%attr(755,root,root) /sbin/rpc.gssd
 %attr(755,root,root) %{_sbindir}/mountstats
 %attr(755,root,root) %{_sbindir}/nfsiostat
-%attr(755,root,root) %{_sbindir}/rpc.gssd
 %attr(755,root,root) %{_sbindir}/showmount
 %{_mandir}/man5/nfsmount.conf.5*
 %{_mandir}/man8/blkmapd.8*
@@ -530,11 +534,11 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/nfslock
 %attr(755,root,root) %{_sbindir}/gss_clnt_send_err
 %attr(755,root,root) %{_sbindir}/gss_destroy_creds
-%attr(755,root,root) %{_sbindir}/nfsidmap
-%attr(755,root,root) %{_sbindir}/rpc.idmapd
-%attr(755,root,root) %{_sbindir}/rpc.statd
 %attr(755,root,root) %{_sbindir}/sm-notify
-%attr(755,root,root) %{_sbindir}/start-statd
+%attr(755,root,root) /sbin/nfsidmap
+%attr(755,root,root) /sbin/rpc.idmapd
+%attr(755,root,root) /sbin/rpc.statd
+%attr(755,root,root) /sbin/start-statd
 %dir %{_var}/lib/nfs
 %dir %{_var}/lib/nfs/rpc_pipefs
 %dir %{_var}/lib/nfs/v4recovery

diff --git a/nfsfs.init b/nfsfs.init
index 8386982af14385e7638ce58dde2798d350720ee1..d765d5b909ae38ec6d50e8d5cf9152625476662e 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -53,15 +53,6 @@ start() {
                /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
        fi
 
-       # Special case /usr first
-       if ! awk '{ if ($2 == "/usr" && $3 ~ /^nfs(4$|$)/ && $4 !~ /noauto/) exit 1}' /etc/fstab; then
-               run_cmd "Mounting /usr filesystem" mount /usr
-               # In case of /usr over NFS idmapd, gssd and lockd may not start
-               # check if they're running and try to start them if not
-               /sbin/service idmapd status >/dev/null || /sbin/service idmapd start
-               /sbin/service gssd status >/dev/null || /sbin/service gssd start
-               /sbin/service nfslock status >/dev/null || /sbin/service nfslock start
-       fi
        run_cmd "Mounting NFS filesystems" mount -a -t nfs,nfs4
        touch /var/lock/subsys/nfsfs
 }

diff --git a/nfslock.init b/nfslock.init
index 748f9863672b1b9ba76c1371949e854d258d53e8..1ece3ccaaadc50f51515f6eeeeccba5f60dcd9ad 100644 (file)
--- a/nfslock.init
+++ b/nfslock.init
@@ -34,9 +34,6 @@ if [ "$1" != "stop" ]; then
        check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
 fi
 
-# /usr may be on NFS, fail silently, nfsfs will start it
-[ -x /usr/sbin/rpc.statd ] || exit 0
-
 start() {
        # Check if the service is already running?
        if [ -f /var/lock/subsys/nfslock ]; then
@@ -55,7 +52,7 @@ start() {
        # Start daemons.
        # Don't put sm-notify here, statd will run it when started
        msg_starting "RPC statd"
-       daemon /usr/sbin/rpc.statd $STATDOPTIONS
+       daemon /sbin/rpc.statd $STATDOPTIONS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
 }

diff --git a/rpcgssd.init b/rpcgssd.init
index c39ec4e2d485ec4efa75c41c1a3269e05172b3c9..5a96c3e34ed2ebe82a092c8d1eaa61e4eec95aab 100644 (file)
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -34,9 +34,6 @@ is_yes "${SECURE_NFS}" || exit 0
 # List of kernel modules to load
 [ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5"
 
-# /usr may be on NFS, fail silently, nfsfs will start it
-[ -x /usr/sbin/rpc.gssd ] || exit 0
-
 start() {
        # Check if the service is already running?
        if [ -f /var/lock/subsys/gssd ]; then
@@ -54,7 +51,7 @@ start() {
                _modprobe single die $i
        done
        msg_starting "RPC gssd"
-       daemon rpc.gssd $RPCGSSOPTIONS
+       daemon /sbin/rpc.gssd $RPCGSSOPTIONS
        RETVAL=$?
        [ $RETVAL = 0 ] && touch /var/lock/subsys/gssd
 }

diff --git a/rpcidmapd.init b/rpcidmapd.init
index 3a5ca6499974eba23358b22d8cb72eab1a249a18..cc8fc5c8ef4248f1ec198b2d76d29ddc79be8a4c 100644 (file)
--- a/rpcidmapd.init
+++ b/rpcidmapd.init
@@ -26,9 +26,6 @@ fi
 [ -f /etc/sysconfig/nfsfs ] && . /etc/sysconfig/nfsfs
 [ -f /etc/sysconfig/nfsd ] && . /etc/sysconfig/nfsd
 
-# /usr may be on NFS, fail silently, nfsfs will start it
-[ -x /usr/sbin/rpc.idmapd ] || exit 0
-
 # Find out what the current runlevel dir is
 RUNLEVELDIR=$(cat /var/run/runlevel.dir)
 
@@ -54,7 +51,7 @@ start() {
        fi
 
        msg_starting "RPC idmapd"
-       daemon /usr/sbin/rpc.idmapd $RPCIDMAPOPTIONS
+       daemon /sbin/rpc.idmapd $RPCIDMAPOPTIONS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/idmapd
 }