On Sunday, August 31, 2014 16:35 CEST, "Kirill Bychkov" <[email protected]>
wrote:
> On Sun, August 31, 2014 15:14, Sebastian Reitenbach wrote:
> >
> > On Friday, August 22, 2014 23:29 CEST, Brad Smith <[email protected]> wrote:
> >
> >> Here is an update to isc-dhcp 4.3.1.
> >>
> >> OK?
>
> Hi.
>
> >
> > With a short test, it works for me, additionally, I added rc scripts for
> > isc_dhcpd and isc_dhcrelay. The names for the scripts are chosen
> > similar to what isc-bind port does.
> > Further @sample dhcpd.conf to /etc
> > and added some FAKE_FLAGS to prevent some warnings on
> > update-plist.
> >
> > Does this work for you too?
> >
> [...]
> >
> > Index: pkg/PLIST-main
> > ===================================================================
> > RCS file: /cvs/ports/net/isc-dhcp/pkg/PLIST-main,v
> > retrieving revision 1.4
> > diff -u -p -u -r1.4 PLIST-main
> > --- pkg/PLIST-main 14 Jan 2012 12:43:25 -0000 1.4
> > +++ pkg/PLIST-main 31 Aug 2014 11:07:23 -0000
> > @@ -11,4 +11,10 @@
> > @bin sbin/dhcrelay
> > share/examples/isc-dhcp/
> > share/examples/isc-dhcp/dhcpd.conf
> > +@sample /etc/dhcpd.conf
>
> This will conflict with default dhcpd.conf. I think you should name it
> isc-dhcpd.conf.
is it still there, or didn't it moved to the examples subdirectory?
In case it conflicts, I'd rather put it in a subdirectory, i.e. /etc/dhcp/
because the isc-dhcpd also supports includes, so that the main
config, and potential includes could live in that separate
directory.
Sebastian
>
> > @extra /var/db/dhcpd.leases
> > +@mode
> > +@owner
> > +@group
> > +@rcscript ${RCDIR}/isc_dhcpd
> > +@rcscript ${RCDIR}/isc_dhcrelay
> > Index: pkg/isc_dhcpd.rc
> > ===================================================================
> > RCS file: pkg/isc_dhcpd.rc
> > diff -N pkg/isc_dhcpd.rc
> > --- /dev/null 1 Jan 1970 00:00:00 -0000
> > +++ pkg/isc_dhcpd.rc 31 Aug 2014 11:07:23 -0000
> > @@ -0,0 +1,12 @@
> > +#!/bin/sh
> > +#
> > +# $OpenBSD$
> > +
> > +daemon="${TRUEPREFIX}/sbin/dhcpd"
> > +daemon_flags="-cf /etc/dhcpd.conf -user _dhcp -group _dhcp -lf
> > /var/db/dhcpd.leases"
> > +
> > +. /etc/rc.d/rc.subr
> > +
> > +rc_reload=NO
> > +
> > +rc_cmd $1
> > Index: pkg/isc_dhcrelay.rc
> > ===================================================================
> > RCS file: pkg/isc_dhcrelay.rc
> > diff -N pkg/isc_dhcrelay.rc
> > --- /dev/null 1 Jan 1970 00:00:00 -0000
> > +++ pkg/isc_dhcrelay.rc 31 Aug 2014 11:07:23 -0000
> > @@ -0,0 +1,11 @@
> > +#!/bin/sh
> > +#
> > +# $OpenBSD$
> > +
> > +daemon="${TRUEPREFIX}/sbin/dhcrelay"
> > +
> > +. /etc/rc.d/rc.subr
> > +
> > +rc_reload=NO
> > +
> > +rc_cmd $1
> >
> >
> >
> >
>
>