- rel 3; separate dhcpd6.conf for dhcpd6

Changed files:
    dhcp.spec -> 1.178
    dhcp6.init -> 1.12

diff --git a/dhcp.spec b/dhcp.spec
index 32b735054e91f6d16a2c24e2127ffb9b3ab42d96..6bea925359a17e09be3fc816fb353b49c3268e3d 100644 (file)
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -13,7 +13,7 @@ Summary(pt_BR.UTF-8): Servidor DHCP (Protocolo de configuração dinâmica de ho
 Name:          dhcp
 # 4.1.0a1 is on DEVEL
 Version:       4.0.2
-Release:       2
+Release:       3
 Epoch:         4
 License:       MIT
 Group:         Networking/Daemons
@@ -309,6 +309,7 @@ install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/dhcp-relay
 install %{SOURCE14} $RPM_BUILD_ROOT/sbin/dhclient-script
 
 install server/dhcpd.conf $RPM_BUILD_ROOT%{_sysconfdir}
+:> $RPM_BUILD_ROOT%{_sysconfdir}/dhcpd6.conf
 
 %if %{with ldap}
 install -d $RPM_BUILD_ROOT%{schemadir}
@@ -421,6 +422,7 @@ fi
 %doc contrib/ms2isc %{?with_ldap:contrib/dhcpd-conf-to-ldap README.ldap}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcpd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcpd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcpd6.conf
 %attr(755,root,root) %{_bindir}/omshell
 %attr(755,root,root) %{_sbindir}/dhcpd
 %attr(754,root,root) /etc/rc.d/init.d/dhcpd

diff --git a/dhcp6.init b/dhcp6.init
index 64686fd105abb355d9237d17be89f254b625e043..13820cdca62e5dabee4f76452cf02f0515cc373a 100644 (file)
--- a/dhcp6.init
+++ b/dhcp6.init
@@ -36,7 +36,7 @@ check_device_up()
 # configtest itself
 configtest() {
        local rc=0
-       /sbin/dhcpd -6 -pf /var/run/dhpcd6.pid -q -t -T || rc=$?
+       /sbin/dhcpd -6 -pf -cf /etc/dhcpd6.conf /var/run/dhpcd6.pid -q -t -T || rc=$?
 
        # check if interfaces specified exist and have addresses
        for i in $DHCPD_INTERFACES; do
@@ -94,7 +94,7 @@ start() {
 
        checkconfig
        msg_starting "DHCP IPv6 Server"
-       daemon /sbin/dhcpd -6 -pf /var/run/dhpcd6.pid -q $DHCPD_INTERFACES
+       daemon /sbin/dhcpd -6 -pf -cf /etc/dhcpd6.conf /var/run/dhpcd6.pid -q $DHCPD_INTERFACES
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcpd6
 }