[nfs-utils/f13/master] Initscripts do not conform to LSB specification (bz 621562)
Steve Dickson
steved at fedoraproject.org
Fri Oct 15 20:19:30 UTC 2010
commit 510c264d73e40d4f80326893e8dfd37cdf21ea9b
Author: Steve Dickson <steved at redhat.com>
Date: Fri Oct 15 15:29:56 2010 -0400
Initscripts do not conform to LSB specification (bz 621562)
Signed-off-by: Steve Dickson <steved at redhat.com>
nfs-utils.spec | 5 ++++-
rpcgssd.init | 6 +++---
rpcsvcgssd.init | 6 +++---
3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 9f1b05f..c43c6f2 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -254,6 +254,9 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Fri Oct 15 2010 Steve Dickson <steved at redhat.com> 1.2.2-6
+- Initscripts do not conform to LSB specification (bz 621562)
+
* Thu Sep 16 2010 Steve Dickson <steved at redhat.com> 1.2.2-5
- Update to upstream RC release: nfs-utils-1-2-3-rc6
diff --git a/rpcgssd.init b/rpcgssd.init
index 6db801d..29b4954 100755
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -27,9 +27,6 @@
# Check for and source configuration file otherwise set defaults
[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
-# See if we are configured to start
-[ "${SECURE_NFS}" != "yes" ] && exit 6
-
# Try to use machine credentials by default
RETVAL=0
uid=`id | cut -d\( -f1 | cut -d= -f2`
@@ -98,6 +95,9 @@ case "$1" in
[ $RETVAL -eq 0 ] && touch $LOCKFILE
;;
stop)
+ # Just exit if not configured
+ [ "${SECURE_NFS}" != "yes" ] && exit 6
+
# Only root can stop the service
[ $uid -ne 0 ] && exit 4
diff --git a/rpcsvcgssd.init b/rpcsvcgssd.init
index a8c4051..5f99b86 100755
--- a/rpcsvcgssd.init
+++ b/rpcsvcgssd.init
@@ -26,9 +26,6 @@
# Check for and source configuration file otherwise set defaults
[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
-# See if we are configured to start
-[ "${SECURE_NFS}" != "yes" ] && exit 6
-
RETVAL=0
prog="rpc.svcgssd"
LOCKFILE=/var/lock/subsys/$prog
@@ -94,6 +91,9 @@ case "$1" in
[ $RETVAL -eq 0 ] && touch $LOCKFILE
;;
stop)
+ # Just exit if not configured
+ [ "${SECURE_NFS}" != "yes" ] && exit 6
+
# Only root can stop the service
[ $uid -ne 0 ] && exit 4
More information about the scm-commits
mailing list