Attachment 155256 Details for Bug 240978 – a proposed patch

[patch] a proposed patch

nfs-utils.patch (text/plain), 1.71 KB, created by Stepan Kasal on 2007-05-23 15:09:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stepan Kasal

Created: 2007-05-23 15:09:20 UTC

Size: 1.71 KB

patch

obsolete

>? nfs-utils.patch
>Index: devel/nfs.init
>===================================================================
>RCS file: /cvs/extras/rpms/nfs-utils/devel/nfs.init,v
>retrieving revision 1.26
>diff -u -r1.26 nfs.init
>--- devel/nfs.init	16 May 2007 17:34:55 -0000	1.26
>+++ devel/nfs.init	23 May 2007 14:26:22 -0000
>@@ -166,17 +166,20 @@
> 	fi
> 	;;
>   condrestart)
>-	[ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd condrestart
>-  	[ -f /var/lock/subsys/nfs ] && {
>-		$0 stop
>-		$0 start
>-	}
>+	if [ -x /usr/sbin/rpc.svcgssd ]; then
>+		/sbin/service rpcsvcgssd condrestart
>+	fi
>+  	if [ $? = 0 -a -f /var/lock/subsys/nfs ]; then
>+		$0 stop && $0 start
>+	fi
> 	;;
>   condstop)
>-	[ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd condstop
>-  	[ -f /var/lock/subsys/nfs ] && {
>+	if [ -x /usr/sbin/rpc.svcgssd ]; then
>+		/sbin/service rpcsvcgssd condstop
>+	fi
>+  	if [ $? = 0 -a -f /var/lock/subsys/nfs ]; then
> 		$0 stop
>-	}
>+	fi
> 	;;
>   *)
> 	echo $"Usage: nfs {start|stop|status|restart|reload|condrestart|condstop}"
>Index: devel/nfslock.init
>===================================================================
>RCS file: /cvs/extras/rpms/nfs-utils/devel/nfslock.init,v
>retrieving revision 1.17
>diff -u -r1.17 nfslock.init
>--- devel/nfslock.init	16 May 2007 17:34:55 -0000	1.17
>+++ devel/nfslock.init	23 May 2007 14:26:22 -0000
>@@ -134,19 +134,18 @@
> 	fi
> 	;;
>   condrestart)
>-  	[ -f /var/lock/subsys/nfslock ] && {
>-		stop
>-		start
>-	}
>+  	if [ -f /var/lock/subsys/nfslock ]; then
>+		stop && start
>+	fi
> 	;;
>   condstop)
>-  	[ -f /var/lock/subsys/nfslock ] && {
>+  	if [ -f /var/lock/subsys/nfslock ]; then
> 		stop
>-	}
>+	fi
> 	;;
>   *)
> 	echo $"Usage: $0 {start|stop|status|restart|probe|condrestart|condstop}"
> 	exit 1
> esac
> 
>-exit $RETVAL
>+exit $?

Actions: View | Diff

Attachments on bug 240978: 155256