rpms/net-tools/F-12 net-tools-1.60-netplugd_init.patch, 1.1, 1.2 net-tools.spec, 1.103, 1.104

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/net-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19290

Modified Files:
	net-tools-1.60-netplugd_init.patch net-tools.spec 
Log Message:
* Tue Nov 10 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-98
- fix init script to be LSB-compliant (#522888)


net-tools-1.60-netplugd_init.patch:
 rc.netplugd |  111 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 82 insertions(+), 29 deletions(-)

Index: net-tools-1.60-netplugd_init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/F-12/net-tools-1.60-netplugd_init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- net-tools-1.60-netplugd_init.patch	8 Jun 2007 11:33:48 -0000	1.1
+++ net-tools-1.60-netplugd_init.patch	10 Nov 2009 14:47:02 -0000	1.2
@@ -1,32 +1,140 @@
---- net-tools-1.60/netplug-1.2.9/scripts/rc.netplugd.old	2007-06-08 13:03:45.000000000 +0200
-+++ net-tools-1.60/netplug-1.2.9/scripts/rc.netplugd	2007-06-08 13:04:01.000000000 +0200
-@@ -17,11 +17,6 @@
+diff -up net-tools-1.60/netplug-1.2.9/scripts/rc.netplugd.netplugd_init net-tools-1.60/netplug-1.2.9/scripts/rc.netplugd
+--- net-tools-1.60/netplug-1.2.9/scripts/rc.netplugd.netplugd_init	2005-01-08 06:43:03.000000000 +0100
++++ net-tools-1.60/netplug-1.2.9/scripts/rc.netplugd	2009-11-10 15:18:48.000000000 +0100
+@@ -1,5 +1,12 @@
+ #!/bin/sh
+ #
++### BEGIN INIT INFO
++# Provides: netplugd
++# Short-Description: start and stop network plug daemon
++# Description: netplugd is a daemon for managing non-static network
++#              interfaces.
++### END INIT INFO
++#
+ # netplugd     This shell script takes care of starting and stopping
+ #              the network plug management daemon.
+ #
+@@ -17,48 +24,94 @@
  # Source networking configuration.
  . /etc/sysconfig/network
  
 -# Check that networking is up.
 -[ ${NETWORKING} = "no" ] && exit 0
--
++[ -f /etc/sysconfig/netplugd ] && . /etc/sysconfig/netplugd
++
+ 
 -[ -x /sbin/netplugd ] || exit 0
--
- if [ -f /etc/sysconfig/netplugd ]; then
-     . /etc/sysconfig/netplugd
++prog=netplugd
++exec=/sbin/netplugd
++config=/etc/netplug/netplugd.conf
++lockfile=/var/lock/subsys/netplugd
++pidfile=/var/run/netplugd.pid
++
++check() {
++	# Check that we're a privileged user
++	[ `id -u` = 0 ] || exit 4
++	
++	# Check if netplugd is executable
++	[ -x $exec ] || exit 5
++}
+ 
+-if [ -f /etc/sysconfig/netplugd ]; then
+-    . /etc/sysconfig/netplugd
++start () {
++        check
++
++	[ ${NETWORKING} = "no" ] && exit 1
++	[ -f $config ] || exit 6
++
++	echo -n $"Starting $prog: "
++	daemon $exec ${NETPLUGDARGS} -p $pidfile
++	RETVAL=$?
++	echo
++
++	[ $RETVAL -eq 0 ] && touch $lockfile
++	return $RETVAL
++}
++
++stop () {
++        check
++
++	echo -n $"Shutting down $prog: "
++	killproc $prog
++	RETVAL=$?
++	echo
++
++	[ $RETVAL -eq 0 ] && rm -f $lockfile
++	return $RETVAL
++}
++
++restart() {
++	stop
++	start
++}
++
++rh_status() {
++    status $prog
++}
++
++rh_status_q() {
++    rh_status >/dev/null 2>&1
++}
++
++if [ $# -gt 1 ]; then
++    exit 2
  fi
-@@ -30,6 +25,8 @@
+ 
+-# See how we were called.
  case "$1" in
    start)
- 	# Start daemon.
-+	[ ${NETWORKING} = "no" ] && exit 1
-+	[ -x /sbin/netplugd ] || exit 1
- 	echo -n $"Starting network plug daemon: "
- 	daemon /sbin/netplugd ${NETPLUGDARGS} -p /var/run/netplugd.pid
- 	RETVAL=$?
-@@ -57,7 +54,7 @@
+-	# Start daemon.
+-	echo -n $"Starting network plug daemon: "
+-	daemon /sbin/netplugd ${NETPLUGDARGS} -p /var/run/netplugd.pid
+-	RETVAL=$?
+-	echo
+-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/netplugd
++	rh_status_q && exit 0
++	start
+ 	;;
+   stop)
+-	# Stop daemon.
+-	echo -n $"Shutting down network plug daemon: "
+-	killproc netplugd
+-	RETVAL=$?
+-	echo
+-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/netplugd
++	rh_status_q || exit 0
++	stop
+ 	;;
+-  status)
+-	status netplugd
+-	RETVAL=$?
++  restart|force-reload)
++	restart
+ 	;;
+-  restart|reload)
+-	$0 stop
+-	$0 start
++  reload)
++        rh_status_q || exit 7
++        restart
++        ;;
++  condrestart|try-restart)
++	rh_status_q || exit 0
++	restart
+ 	;;
+-  condrestart)
+-	[ -f /var/lock/subsys/netplugd ] && restart || :
++  status)
++	rh_status
  	;;
    *)
- 	echo $"Usage: $0 {start|stop|status|restart}"
+-	echo $"Usage: $0 {start|stop|status|restart}"
 -	RETVAL=1
-+	RETVAL=3
++	echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++	exit 2
  	;;
  esac
  
+-exit $RETVAL
++exit $?


Index: net-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/F-12/net-tools.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- net-tools.spec	4 Nov 2009 13:25:52 -0000	1.103
+++ net-tools.spec	10 Nov 2009 14:47:02 -0000	1.104
@@ -3,7 +3,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 97%{?dist}
+Release: 98%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.berlios.de/
@@ -316,9 +316,12 @@ exit 0
 %config(noreplace) %{_sysconfdir}/netplug/netplugd.conf
 %config(noreplace) %{_sysconfdir}/ethers
 %{_sysconfdir}/netplug.d
-%{_sysconfdir}/rc.d/init.d/netplugd
+%{_initddir}/netplugd
 
 %changelog
+* Tue Nov 10 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-98
+- fix init script to be LSB-compliant (#522888)
+
 * Wed Nov  4 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-97
 - in mii-tool.c use <linux/mii.h> instead of "mii.h" and fix Bug #491358