Author: baggins Date: Wed Jan 18 21:48:24 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- move blkmapd, idmapd, statd and gssd to /sbin which allows us to remove
chicken-egg hacks for possible /usr mounts
---- Files affected:
packages/nfs-utils:
blkmapd.init (1.1 -> 1.2) , nfs-blkmapd.service (1.1 -> 1.2) ,
nfs-gssd.service (1.1 -> 1.2) , nfs-idmapd.service (1.1 -> 1.2) ,
nfs-utils.spec (1.220 -> 1.221) , nfsfs.init (1.44 -> 1.45) , nfslock.init
(1.25 -> 1.26) , rpcgssd.init (1.12 -> 1.13) , rpcidmapd.init (1.19 -> 1.20)
---- Diffs:
================================================================
Index: packages/nfs-utils/blkmapd.init
diff -u packages/nfs-utils/blkmapd.init:1.1 packages/nfs-utils/blkmapd.init:1.2
--- packages/nfs-utils/blkmapd.init:1.1 Fri Oct 7 14:35:38 2011
+++ packages/nfs-utils/blkmapd.init Wed Jan 18 22:48:18 2012
@@ -41,7 +41,7 @@
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
}
================================================================
Index: packages/nfs-utils/nfs-blkmapd.service
diff -u packages/nfs-utils/nfs-blkmapd.service:1.1
packages/nfs-utils/nfs-blkmapd.service:1.2
--- packages/nfs-utils/nfs-blkmapd.service:1.1 Wed Jan 18 20:23:13 2012
+++ packages/nfs-utils/nfs-blkmapd.service Wed Jan 18 22:48:18 2012
@@ -7,7 +7,7 @@
Type=forking
StandardError=syslog+console
EnvironmentFile=-/etc/sysconfig/nfsfs
-ExecStart=/usr/sbin/blkmapd $BLKMAPDOPTIONS
+ExecStart=/sbin/blkmapd $BLKMAPDOPTIONS
[Install]
WantedBy=multi-user.target
================================================================
Index: packages/nfs-utils/nfs-gssd.service
diff -u packages/nfs-utils/nfs-gssd.service:1.1
packages/nfs-utils/nfs-gssd.service:1.2
--- packages/nfs-utils/nfs-gssd.service:1.1 Wed Jan 18 20:23:13 2012
+++ packages/nfs-utils/nfs-gssd.service Wed Jan 18 22:48:18 2012
@@ -7,7 +7,7 @@
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
================================================================
Index: packages/nfs-utils/nfs-idmapd.service
diff -u packages/nfs-utils/nfs-idmapd.service:1.1
packages/nfs-utils/nfs-idmapd.service:1.2
--- packages/nfs-utils/nfs-idmapd.service:1.1 Wed Jan 18 20:23:13 2012
+++ packages/nfs-utils/nfs-idmapd.service Wed Jan 18 22:48:18 2012
@@ -8,7 +8,7 @@
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
================================================================
Index: packages/nfs-utils/nfs-utils.spec
diff -u packages/nfs-utils/nfs-utils.spec:1.220
packages/nfs-utils/nfs-utils.spec:1.221
--- packages/nfs-utils/nfs-utils.spec:1.220 Wed Jan 18 20:25:47 2012
+++ packages/nfs-utils/nfs-utils.spec Wed Jan 18 22:48:18 2012
@@ -82,6 +82,7 @@
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
@@ -185,7 +186,7 @@
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
@@ -246,7 +247,7 @@
--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
@@ -263,17 +264,20 @@
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
@@ -504,10 +508,10 @@
%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*
@@ -531,11 +535,11 @@
%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
@@ -566,6 +570,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.221 2012/01/18 21:48:18 baggins
+- move blkmapd, idmapd, statd and gssd to /sbin which allows us to remove
+ chicken-egg hacks for possible /usr mounts
+
Revision 1.220 2012/01/18 19:25:47 baggins
- switch to systemd makes TODO obsolete
================================================================
Index: packages/nfs-utils/nfsfs.init
diff -u packages/nfs-utils/nfsfs.init:1.44 packages/nfs-utils/nfsfs.init:1.45
--- packages/nfs-utils/nfsfs.init:1.44 Sun Oct 3 01:08:20 2010
+++ packages/nfs-utils/nfsfs.init Wed Jan 18 22:48:18 2012
@@ -53,15 +53,6 @@
/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
}
================================================================
Index: packages/nfs-utils/nfslock.init
diff -u packages/nfs-utils/nfslock.init:1.25
packages/nfs-utils/nfslock.init:1.26
--- packages/nfs-utils/nfslock.init:1.25 Wed Jan 18 20:25:05 2012
+++ packages/nfs-utils/nfslock.init Wed Jan 18 22:48:18 2012
@@ -34,9 +34,6 @@
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 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
}
================================================================
Index: packages/nfs-utils/rpcgssd.init
diff -u packages/nfs-utils/rpcgssd.init:1.12
packages/nfs-utils/rpcgssd.init:1.13
--- packages/nfs-utils/rpcgssd.init:1.12 Sun Oct 3 01:08:20 2010
+++ packages/nfs-utils/rpcgssd.init Wed Jan 18 22:48:18 2012
@@ -34,9 +34,6 @@
# 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 @@
_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
}
================================================================
Index: packages/nfs-utils/rpcidmapd.init
diff -u packages/nfs-utils/rpcidmapd.init:1.19
packages/nfs-utils/rpcidmapd.init:1.20
--- packages/nfs-utils/rpcidmapd.init:1.19 Sun Oct 3 01:08:20 2010
+++ packages/nfs-utils/rpcidmapd.init Wed Jan 18 22:48:18 2012
@@ -26,9 +26,6 @@
[ -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 @@
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
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/blkmapd.init?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-blkmapd.service?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-gssd.service?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-idmapd.service?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils.spec?r1=1.220&r2=1.221&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfsfs.init?r1=1.44&r2=1.45&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfslock.init?r1=1.25&r2=1.26&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/rpcgssd.init?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/rpcidmapd.init?r1=1.19&r2=1.20&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
