rpms/dhcp/F-12 dhcp.spec, 1.281, 1.282 dhcpd6.init, 1.1, 1.2 dhcrelay.init, 1.13, 1.14
Jiří Popelka
jpopelka at fedoraproject.org
Mon Jan 18 09:11:51 UTC 2010
Author: jpopelka
Update of /cvs/pkgs/rpms/dhcp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24381
Modified Files:
dhcp.spec dhcpd6.init dhcrelay.init
Log Message:
* Mon Jan 18 2010 Jiri Popelka <jpopelka at 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)
Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/dhcp.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- dhcp.spec 15 Jan 2010 12:34:30 -0000 1.281
+++ dhcp.spec 18 Jan 2010 09:11:51 -0000 1.282
@@ -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 at 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 at redhat.com> - 12:4.1.0p1-16
- Added init script to also start dhcpd for IPv6 (#552453)
- Added dhcpd6.conf.sample
Index: dhcpd6.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/dhcpd6.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dhcpd6.init 15 Jan 2010 12:34:30 -0000 1.1
+++ dhcpd6.init 18 Jan 2010 09:11:51 -0000 1.2
@@ -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
Index: dhcrelay.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/dhcrelay.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dhcrelay.init 15 Jan 2010 12:34:30 -0000 1.13
+++ dhcrelay.init 18 Jan 2010 09:11:51 -0000 1.14
@@ -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
}
More information about the scm-commits
mailing list