OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 25-Jul-2003 23:45:12
Branch: HEAD Handle: 2003072522451001
Modified files:
openpkg-src/dhcpd dhcpd.spec rc.dhcpd
openpkg-web news.txt
Log:
handle PR#176 in a proper way; we do not talk about known addresses
but interfaces with unpredictable names here
Summary:
Revision Changes Path
1.47 +1 -1 openpkg-src/dhcpd/dhcpd.spec
1.13 +11 -1 openpkg-src/dhcpd/rc.dhcpd
1.5821 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 24 Jul 2003 07:03:13 -0000 1.46
+++ openpkg-src/dhcpd/dhcpd.spec 25 Jul 2003 21:45:11 -0000 1.47
@@ -33,7 +33,7 @@
Group: DNS
License: ISC/BSD
Version: 3.0.1rc11
-Release: 20030724
+Release: 20030725
# list of sources
Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/rc.dhcpd
============================================================================
$ cvs diff -u -r1.12 -r1.13 rc.dhcpd
--- openpkg-src/dhcpd/rc.dhcpd 24 Jul 2003 07:03:13 -0000 1.12
+++ openpkg-src/dhcpd/rc.dhcpd 25 Jul 2003 21:45:11 -0000 1.13
@@ -5,6 +5,9 @@
%config
dhcpd_enable="$openpkg_rc_def"
+ dhcpd_flags="-q"
+ dhcpd_if=""
+ dhcpd_port="67"
dhcpd_log_prolog="true"
dhcpd_log_epilog="true"
dhcpd_log_numfiles="10"
@@ -20,6 +23,7 @@
%status -u @l_susr@ -o
dhcpd_usable="unknown"
dhcpd_active="no"
+ [ ".$dhcpd_if" = . ] && dhcpd_usable="no"
rcService dhcpd enable yes && \
dhcpd_signal 0 && dhcpd_active="yes"
echo "dhcpd_enable=\"$dhcpd_enable\""
@@ -28,8 +32,14 @@
%start -u @l_susr@
rcService dhcpd enable yes || exit 0
+ rcService dhcpd usable no && exit 0
rcService dhcpd active yes && exit 0
- @l_prefix@/sbin/dhcpd >/dev/null 2>&1
+ flags="$dhcpd_flags"
+ echo $flags | grep -- -p >/dev/null
+ if [ $? -ne 0 -a ".$dhcpd_port" != . ]; then
+ flags="$flags -p $dhcpd_port"
+ fi
+ @l_prefix@/sbin/dhcpd $flags $dhcpd_if >/dev/null 2>&1
%stop -u @l_susr@
rcService dhcpd enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5820 -r1.5821 news.txt
--- openpkg-web/news.txt 25 Jul 2003 20:54:49 -0000 1.5820
+++ openpkg-web/news.txt 25 Jul 2003 21:45:10 -0000 1.5821
@@ -1,3 +1,4 @@
+25-Jul-2003: Upgraded package: P<dhcpd-3.0.1rc11-20030725>
25-Jul-2003: Upgraded package: P<wx-2.4.1-20030725>
25-Jul-2003: Upgraded package: P<ircd-2.10.3p3-20030725>
25-Jul-2003: New package: P<wxwindows-2.4.1-20030725>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
