Author: arekm Date: Tue May 18 12:30:16 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; separate dhcpd6.conf for dhcpd6
---- Files affected:
packages/dhcp:
dhcp.spec (1.177 -> 1.178) , dhcp6.init (1.11 -> 1.12)
---- Diffs:
================================================================
Index: packages/dhcp/dhcp.spec
diff -u packages/dhcp/dhcp.spec:1.177 packages/dhcp/dhcp.spec:1.178
--- packages/dhcp/dhcp.spec:1.177 Sun May 2 15:21:16 2010
+++ packages/dhcp/dhcp.spec Tue May 18 14:30:10 2010
@@ -14,7 +14,7 @@
Name: dhcp
# 4.1.0a1 is on DEVEL
Version: 4.0.2
-Release: 2
+Release: 3
Epoch: 4
License: MIT
Group: Networking/Daemons
@@ -310,6 +310,7 @@
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}
@@ -422,6 +423,7 @@
%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
@@ -499,6 +501,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.178 2010/05/18 12:30:10 arekm
+- rel 3; separate dhcpd6.conf for dhcpd6
+
Revision 1.177 2010/05/02 13:21:16 jajcus
- /etc/dhclient-{enter,exit}-hooks.d/ dirs for easier plugging-in
- client: S: avahi-autoipd (provides IPV4all-providing hooks for dhclient)
================================================================
Index: packages/dhcp/dhcp6.init
diff -u packages/dhcp/dhcp6.init:1.11 packages/dhcp/dhcp6.init:1.12
--- packages/dhcp/dhcp6.init:1.11 Thu Nov 19 22:28:12 2009
+++ packages/dhcp/dhcp6.init Tue May 18 14:30:10 2010
@@ -36,7 +36,7 @@
# 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 @@
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
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcp/dhcp.spec?r1=1.177&r2=1.178&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcp/dhcp6.init?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
