From 3de7b0d7b0454ed1c0613fa5fc6bf4ccd1f67190 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Mon, 3 Mar 2014 15:27:30 +0100
Subject: [PATCH] remove sysvinit script

---
 iputils.spec | 16 +---------
 rdisc.initd  | 87 ----------------------------------------------------
 2 files changed, 1 insertion(+), 102 deletions(-)
 delete mode 100644 rdisc.initd

diff --git a/iputils.spec b/iputils.spec
index 005494b..6bd75f2 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -12,7 +12,6 @@ Group: System Environment/Daemons
 
 Source0: http://www.skbuff.net/iputils/%{name}-s%{version}.tar.bz2
 Source1: ifenslave.tar.gz
-Source3: rdisc.initd
 Source4: rdisc.service
 Source6: ninfod.service
 
@@ -43,16 +42,6 @@ including ping. The ping command sends a series of ICMP protocol
 ECHO_REQUEST packets to a specified network host to discover whether
 the target machine is alive and receiving network traffic.
 
-%package sysvinit
-Group: System Environment/Daemons
-Summary: SysV initscript for rdisc daemon
-Requires: %{name} = %{version}-%{release}
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
-
-%description sysvinit
-The iputils-sysvinit contains SysV initscritps support.
-
 %package ninfod
 Group: System Environment/Daemons
 Summary: Node Information Query Daemon
@@ -115,7 +104,6 @@ ln -s ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
 ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
 
 install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 755 -p %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc
 install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}/%{_unitdir}
 install -m 644 %SOURCE6 ${RPM_BUILD_ROOT}/%{_unitdir}
 
@@ -164,9 +152,6 @@ mv -f RELNOTES.tmp RELNOTES
 %attr(644,root,root) %{_mandir}/man8/tracepath6.8.gz
 %attr(644,root,root) %{_mandir}/man8/ifenslave.8.gz
 
-%files sysvinit
-%{_sysconfdir}/rc.d/init.d/rdisc
-
 %files ninfod
 %attr(0755,root,root) %caps(cap_net_raw=ep) %{_sbindir}/ninfod
 %{_unitdir}/ninfod.service
@@ -176,6 +161,7 @@ mv -f RELNOTES.tmp RELNOTES
 * Mon Feb  3 2014 Jan Synáček <jsynacek@redhat.com> - 20121221-8
 - reference documentation in the service files
 - remove redundant sysconfig-related stuff
+- remove sysvinit script
 
 * Tue Jan 21 2014 Jan Synáček <jsynacek@redhat.com> - 20121221-7
 - Build with pie/full RELRO (#1055742)
diff --git a/rdisc.initd b/rdisc.initd
deleted file mode 100644
index a70e0da..0000000
--- a/rdisc.initd
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#
-# $Id: rdisc,v 1.5 2005/04/05 10:06:01 bastian Exp $
-#
-### BEGIN INIT INFO
-# Provides: rdisc
-# Short-Description: This is a daemon which discovers routers on the local subnet.
-# Description: This is a daemon which discovers routers on the local subnet.
-### END INIT INFO
-
-# chkconfig: - 41 89
-# config: /etc/sysconfig/rdisc
-
-# Source function library.
-. /etc/init.d/functions
-. /etc/sysconfig/network
-
-LOCKFILE=/var/lock/subsys/rdisc
-
-# Set default options in /etc/sysconfig/rdisc
-[ -f /etc/sysconfig/rdisc ] && . /etc/sysconfig/rdisc
-RDISCOPTS=${RDISCOPTS:-"-s"}
-
-start() {
-	# Check that networking is configured.
-	[ ${NETWORKING} = "no" ] && exit 1
-
-	echo -n $"Starting router discovery: "
-	if [ $UID -ne 0 ]; then
-                RETVAL=4
-                failure
-        else
-		daemon /sbin/rdisc $RDISCOPTS
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch $LOCKFILE
-	fi;
-	echo
-	return $RETVAL
-}
-
-stop() {
-	echo -n $"Shutting down router discovery services: "
-	if [ $UID -ne 0 ]; then
-                RETVAL=4
-                failure
-        else
-        	killproc /sbin/rdisc
-		RETVAL=$?
-	        [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
-        fi;
-	echo
-	return $RETVAL
-}
-
-restart() {
-	stop
-	start
-}
-
-RETVAL=0
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  status)
-	status rdisc
-	;;
-  restart|reload)
-	restart
-	;;
-  condrestart)
-	if status $prog > /dev/null; then
-	    stop
-	    start
-	fi
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|status|restart|reload}"
-	exit 2
-esac
-
-exit $?