Bump to rc3 and fix the rc.d script a little.

This commit is contained in:
Roy Marples 2008-07-27 11:14:35 +00:00 committed by Thomas Klausner
parent 1bc00af087
commit 6a80d71127
3 changed files with 15 additions and 21 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.13 2008/07/23 16:10:54 rsmarples Exp $
# $NetBSD: Makefile,v 1.14 2008/07/27 11:14:35 rsmarples Exp $
#
DISTNAME= dhcpcd-4.0.0-rc2
PKGNAME= dhcpcd-4.0.0rc2
DISTNAME= dhcpcd-4.0.0-rc3
PKGNAME= dhcpcd-4.0.0rc3
CATEGORIES= net
MASTER_SITES= http://roy.marples.name/dhcpcd/
EXTRACT_SUFX= .tar.bz2

View file

@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.12 2008/07/23 16:10:54 rsmarples Exp $
$NetBSD: distinfo,v 1.13 2008/07/27 11:14:35 rsmarples Exp $
SHA1 (dhcpcd-4.0.0-rc2.tar.bz2) = 92b8d6a3803fac8f0502bfae559282890a114d97
RMD160 (dhcpcd-4.0.0-rc2.tar.bz2) = e3b2f937ee6cadad2fc54f9692f956004c083472
Size (dhcpcd-4.0.0-rc2.tar.bz2) = 49681 bytes
SHA1 (dhcpcd-4.0.0-rc3.tar.bz2) = 1629a23e7997b889dd206ab41fb18c40bf9b7a36
RMD160 (dhcpcd-4.0.0-rc3.tar.bz2) = a197d4e4a5c7e0752dba2a47415d6c3f578683f0
Size (dhcpcd-4.0.0-rc3.tar.bz2) = 49416 bytes

View file

@ -1,15 +1,8 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: dhcpcd.sh,v 1.1.1.1 2008/01/18 23:34:01 hoka_adam Exp $
#
#!/bin/sh
# PROVIDE: dhclient
# PROVIDE: dhcpcd
# REQUIRE: network mountcritlocal
# BEFORE: NETWORKING
#
# Note that there no syslog logging of dhclient messages at boot because
# dhclient needs to start before services that syslog depends upon do.
#
if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
@ -19,19 +12,20 @@ name="dhcpcd"
rcvar="${name}"
ifn="$2"
command="@PREFIX@/sbin/${name}"
pidfile="@VARBASE@/run/dhcpcs-${ifn}.pid"
command_args="${ifn}"
pidfile="@VARBASE@/run/${name}-${ifn}.pid"
start_precmd="dhcpcd_precmd"
dhcpcd_precmd()
{
# Override for $ifn specific flags (see rc.subr for $flags setting)
specific=`get_if_var $ifn dhcpcd_flags_IF`
if [ -z "$flags" -a -n "$specific" ]; then
rc_flags=$specific
eval ifn_flags=\$${rcvar}_flags_${ifn}
if [ -z "${flags}" -a -n "${ifn_flags}" ]; then
rc_flags=${ifn_flags}
fi
# dhcpcd may need local binaries
PATH=${PATH}:%%PREFIX%%/sbin
PATH=${PATH}:@PREFIX@/sbin
export PATH
}