rpms/dhcp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Hide startup info when starting dhcpd6 service.

Browse Source 
- Remove -TERM from calling killproc when stopping dhcrelay (#555672)
This commit is contained in:
Jiří Popelka 2010-01-18 09:13:37 +00:00
parent 9c63bd9d6e
commit 3728cf43b7
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dhcp.spec
View File

@ -13,7 +13,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: %{basever}p1 Version: %{basever}p1
Release: 17%{?dist} Release: 18%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # 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. # that's why it is at 12 now. It should have never been used, but it was.
@ -517,6 +517,10 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog %changelog
* Mon Jan 18 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.0p1-18
- Hide startup info when starting dhcpd6 service.
- Remove -TERM from calling killproc when stopping dhcrelay (#555672)
* Fri Jan 15 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.0p1-17 * Fri Jan 15 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.0p1-17
- Added init script to also start dhcpd for IPv6 (#552453) - Added init script to also start dhcpd for IPv6 (#552453)
- Added dhcpd6.conf.sample - Added dhcpd6.conf.sample

2
dhcpd6.init
View File

@ -90,7 +90,7 @@ start() {
[ "${config}" = "${default_config}" ] && DHCPDARGS="$DHCPDARGS -cf $default_config" [ "${config}" = "${default_config}" ] && DHCPDARGS="$DHCPDARGS -cf $default_config"
echo -n $"Starting $prog (DHCPv6): " echo -n $"Starting $prog (DHCPv6): "
daemon --pidfile=$pidfile $exec -6 $DHCPDARGS daemon --pidfile=$pidfile $exec -6 $DHCPDARGS 2>/dev/null
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch $lockfile [ $RETVAL -eq 0 ] && touch $lockfile

4
dhcrelay.init
View File

@ -71,13 +71,11 @@ stop() {
rh_status_q || return 0 rh_status_q || return 0
echo -n $"Shutting down $prog: " echo -n $"Shutting down $prog: "
killproc $prog -TERM killproc $prog
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && rm -f $lockfile [ $RETVAL -eq 0 ] && rm -f $lockfile
# killproc -TERM doesn't remove pidfile, remove it manually
[ $RETVAL -eq 0 ] && rm -f $pidfile
return $RETVAL return $RETVAL
} }