Module Name: src
Committed By: snj
Date: Sun May 10 21:32:57 UTC 2009
Modified Files:
src/etc/defaults [netbsd-5]: rc.conf
src/etc/rc.d [netbsd-5]: Makefile
Added Files:
src/etc/rc.d [netbsd-5]: dhcpcd
Log Message:
Pull up following revision(s) (requested by roy in ticket #534):
etc/defaults/rc.conf: revision 1.103
etc/rc.d/Makefile: revision 1.78 via patch
etc/rc.d/dhcpcd: revision 1.1
Add an rc.d script for dhcpcd(8)
To generate a diff of this commit:
cvs rdiff -u -r1.95.2.3 -r1.95.2.4 src/etc/defaults/rc.conf
cvs rdiff -u -r1.68.2.3 -r1.68.2.4 src/etc/rc.d/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/etc/rc.d/dhcpcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.95.2.3 src/etc/defaults/rc.conf:1.95.2.4
--- src/etc/defaults/rc.conf:1.95.2.3 Thu Mar 26 17:45:38 2009
+++ src/etc/defaults/rc.conf Sun May 10 21:32:57 2009
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.95.2.3 2009/03/26 17:45:38 snj Exp $
+# $NetBSD: rc.conf,v 1.95.2.4 2009/05/10 21:32:57 snj Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -154,6 +154,7 @@
auto_ifconfig=YES # config all avail. interfaces
net_interfaces="" # used only if above is NO
flushroutes=YES # flush routes in netstart
+dhcpcd=NO
dhcpcd_flags="-q" # For ifconfig_XXX=dhcp.
dhclient=NO # behave as a DHCP client
dhclient_flags="" # blank: config all interfaces
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.68.2.3 src/etc/rc.d/Makefile:1.68.2.4
--- src/etc/rc.d/Makefile:1.68.2.3 Fri Feb 6 00:51:41 2009
+++ src/etc/rc.d/Makefile Sun May 10 21:32:57 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68.2.3 2009/02/06 00:51:41 snj Exp $
+# $NetBSD: Makefile,v 1.68.2.4 2009/05/10 21:32:57 snj Exp $
.include <bsd.own.mk>
@@ -12,7 +12,7 @@
accounting altqd amd apmd \
bootconf.sh bootparams btattach btconfig btdevctl bthcid \
ccd cgd cleartmp cron \
- dhclient dhcpd dhcrelay dmesg downinterfaces envsys \
+ dhclient dhcpcd dhcpd dhcrelay dmesg downinterfaces envsys \
fsck ftp_proxy ftpd \
hostapd httpd \
identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \
Added files:
Index: src/etc/rc.d/dhcpcd
diff -u /dev/null src/etc/rc.d/dhcpcd:1.1.2.2
--- /dev/null Sun May 10 21:32:57 2009
+++ src/etc/rc.d/dhcpcd Sun May 10 21:32:57 2009
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# PROVIDE: dhcpcd
+# REQUIRE: network mountcritlocal
+# BEFORE: NETWORKING
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name=dhcpcd
+rcvar=$name
+command=/sbin/$name
+pidfile=/var/run/$name.pid
+
+load_rc_config $name
+run_rc_command "$1"
