[rpcbind] Added /etc/sysconfig/rpcbind config file (bz 861025)

Steve Dickson steved at fedoraproject.org
Sun Oct 14 17:21:38 UTC 2012


commit 283dad33f13085b3da0f4a1cac7a128f56b6d70e
Author: Steve Dickson <steved at redhat.com>
Date:   Sun Oct 14 13:08:19 2012 -0400

    Added /etc/sysconfig/rpcbind config file (bz 861025)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 rpcbind.service |    3 ++-
 rpcbind.spec    |    6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/rpcbind.service b/rpcbind.service
index 84184a9..db0fdfa 100644
--- a/rpcbind.service
+++ b/rpcbind.service
@@ -5,7 +5,8 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/sbin/rpcbind -w
+EnvironmentFile=/etc/sysconfig/rpcbind
+ExecStart=/sbin/rpcbind -w ${RPCBINDOPTS}
 
 [Install]
 WantedBy=multi-user.target
diff --git a/rpcbind.spec b/rpcbind.spec
index 17d8e81..01363f2 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -10,6 +10,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 Source0:        http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
 Source1: rpcbind.service
 Source2: rpcbind.socket
+Source3: rpcbind.sysconfig
 
 Patch001: rpcbind-0_2_1-rc3.patch
 Patch002: rpcbind-0.2.0-rpcuser.patch
@@ -60,7 +61,7 @@ make all
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}{/sbin,/usr/sbin}
+mkdir -p %{buildroot}{/sbin,/usr/sbin,/etc/sysconfig}
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_mandir}/man8
 mkdir -p %{buildroot}/var/lib/rpcbind
@@ -70,6 +71,7 @@ mv -f ${RPM_BUILD_ROOT}%{_bindir}/rpcbind ${RPM_BUILD_ROOT}/sbin
 mv -f ${RPM_BUILD_ROOT}%{_bindir}/rpcinfo ${RPM_BUILD_ROOT}%{_sbindir}
 install -m644 %{SOURCE1} %{buildroot}%{_unitdir}
 install -m644 %{SOURCE2} %{buildroot}%{_unitdir}
+install -m644 %{SOURCE3} %{buildroot}/etc/sysconfig/rpcbind
 
 %clean
 rm -rf %{buildroot}
@@ -122,6 +124,7 @@ fi
 
 %files
 %defattr(-,root,root)
+%config(noreplace) /etc/sysconfig/rpcbind
 %doc AUTHORS ChangeLog README
 /sbin/rpcbind
 %{_sbindir}/rpcinfo
@@ -134,6 +137,7 @@ fi
 %changelog
 * Sun Oct 14 2012 Steve Dickson <steved at redhat.com> - 0.2.0-18
 - Fixed typo causing rpcbind to run as root (bz 734598)
+- Added /etc/sysconfig/rpcbind config file (bz 861025)
 
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild


More information about the scm-commits mailing list