From 9d944c48b2c89395e923f2c62718003755cd1ff6 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Mon, 3 Mar 2014 15:19:16 +0100
Subject: [PATCH] remove redundant sysconfig-related stuff

---
 iputils.spec    | 5 +----
 rdisc.service   | 3 +--
 rdisc.sysconfig | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 rdisc.sysconfig

diff --git a/iputils.spec b/iputils.spec
index b7d1bb2..005494b 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -14,7 +14,6 @@ Source0: http://www.skbuff.net/iputils/%{name}-s%{version}.tar.bz2
 Source1: ifenslave.tar.gz
 Source3: rdisc.initd
 Source4: rdisc.service
-Source5: rdisc.sysconfig
 Source6: ninfod.service
 
 Patch0: iputils-20020927-rh.patch
@@ -88,7 +87,6 @@ make -C doc man
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 
 install -c clockdiff		${RPM_BUILD_ROOT}%{_sbindir}/
 install -cp arping		${RPM_BUILD_ROOT}%{_sbindir}/
@@ -118,7 +116,6 @@ 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 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rdisc
 install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}/%{_unitdir}
 install -m 644 %SOURCE6 ${RPM_BUILD_ROOT}/%{_unitdir}
 
@@ -166,7 +163,6 @@ mv -f RELNOTES.tmp RELNOTES
 %attr(644,root,root) %{_mandir}/man8/tracepath.8.gz
 %attr(644,root,root) %{_mandir}/man8/tracepath6.8.gz
 %attr(644,root,root) %{_mandir}/man8/ifenslave.8.gz
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rdisc
 
 %files sysvinit
 %{_sysconfdir}/rc.d/init.d/rdisc
@@ -179,6 +175,7 @@ mv -f RELNOTES.tmp RELNOTES
 %changelog
 * Mon Feb  3 2014 Jan Synáček <jsynacek@redhat.com> - 20121221-8
 - reference documentation in the service files
+- remove redundant sysconfig-related stuff
 
 * Tue Jan 21 2014 Jan Synáček <jsynacek@redhat.com> - 20121221-7
 - Build with pie/full RELRO (#1055742)
diff --git a/rdisc.service b/rdisc.service
index cd2aa36..7eaaf26 100644
--- a/rdisc.service
+++ b/rdisc.service
@@ -5,8 +5,7 @@ Documentation=man:rdisc
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/rdisc
-ExecStart=/sbin/rdisc $RDISCOPTS
+ExecStart=/sbin/rdisc -s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/rdisc.sysconfig b/rdisc.sysconfig
deleted file mode 100644
index bd11c2a..0000000
--- a/rdisc.sysconfig
+++ /dev/null
@@ -1 +0,0 @@
-RDISCOPTS="-s"