From 16b016c75719baafca212b531d503fd0cad0abc6 Mon Sep 17 00:00:00 2001
From: Jiří Popelka <jpopelka@fedoraproject.org>
Date: Jan 18 2010 09:11:51 +0000
Subject: - Hide startup info when starting dhcpd6 service.

- Use macro global instead of define.
- Remove -TERM from calling killproc when stopping dhcrelay (#555672)

---

diff --git a/dhcp.spec b/dhcp.spec
index d167c2c..1719af4 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -1,19 +1,19 @@
 # vendor string (e.g., Fedora, EL)
-%define vvendor Fedora
+%global vvendor Fedora
 
 # Where dhcp configuration files are stored
-%define dhcpconfdir %{_sysconfdir}/dhcp
+%global dhcpconfdir %{_sysconfdir}/dhcp
 
 # Base version number from ISC
-%define basever 4.1.0
+%global basever 4.1.0
 
 # LDAP patch version
-%define ldappatchver %{basever}-5
+%global ldappatchver %{basever}-5
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  16%{?dist}
+Release:  17%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -257,7 +257,7 @@ popd
 %{__perl_requires} \
 | %{__grep} -v 'perl('
 EOF
-%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 %{__chmod} +x %{__perl_requires}
 
 # Replace @PRODUCTNAME@
@@ -517,6 +517,11 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Jan 18 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.0p1-17
+- Hide startup info when starting dhcpd6 service.
+- Use macro global instead of define.
+- Remove -TERM from calling killproc when stopping dhcrelay (#555672)
+
 * Fri Jan 15 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.0p1-16
 - Added init script to also start dhcpd for IPv6 (#552453)
 - Added dhcpd6.conf.sample
diff --git a/dhcpd6.init b/dhcpd6.init
index c7d4673..ed332a0 100755
--- a/dhcpd6.init
+++ b/dhcpd6.init
@@ -90,7 +90,7 @@ start() {
     [ "${config}" = "${default_config}" ] && DHCPDARGS="$DHCPDARGS -cf $default_config"
 
     echo -n $"Starting $prog (DHCPv6): "
-    daemon --pidfile=$pidfile $exec -6 $DHCPDARGS
+    daemon --pidfile=$pidfile $exec -6 $DHCPDARGS 2>/dev/null
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch $lockfile
diff --git a/dhcrelay.init b/dhcrelay.init
index 3689bde..e0094ce 100644
--- a/dhcrelay.init
+++ b/dhcrelay.init
@@ -71,13 +71,11 @@ stop() {
     rh_status_q || return 0
 
     echo -n $"Shutting down $prog: "
-    killproc $prog -TERM
+    killproc $prog
     RETVAL=$?
 
     echo
     [ $RETVAL -eq 0 ] && rm -f $lockfile
-    # killproc -TERM doesn't remove pidfile, remove it manually
-    [ $RETVAL -eq 0 ] && rm -f $pidfile
     return $RETVAL
 }