Module Name: src
Committed By: matt
Date: Wed Apr 21 05:21:24 UTC 2010
Modified Files:
src/etc [matt-nb5-mips64]: MAKEDEV.tmpl Makefile
src/etc/defaults [matt-nb5-mips64]: rc.conf
src/etc/etc.i386 [matt-nb5-mips64]: Makefile.inc
src/etc/etc.sparc [matt-nb5-mips64]: ttys
src/etc/etc.sparc64 [matt-nb5-mips64]: MAKEDEV.conf
src/etc/mtree [matt-nb5-mips64]: NetBSD.dist special
src/etc/rc.d [matt-nb5-mips64]: Makefile named network
src/etc/ssh [matt-nb5-mips64]: ssh_known_hosts
Added Files:
src/etc/rc.d [matt-nb5-mips64]: dhcpcd
Removed Files:
src/etc [matt-nb5-mips64]: audit-packages.conf
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.113.2.6 -r1.113.2.6.4.1 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.359.2.3.4.1 -r1.359.2.3.4.2 src/etc/Makefile
cvs rdiff -u -r1.1 -r0 src/etc/audit-packages.conf
cvs rdiff -u -r1.95.2.3 -r1.95.2.3.4.1 src/etc/defaults/rc.conf
cvs rdiff -u -r1.59 -r1.59.8.1 src/etc/etc.i386/Makefile.inc
cvs rdiff -u -r1.14 -r1.14.6.1 src/etc/etc.sparc/ttys
cvs rdiff -u -r1.13 -r1.13.8.1 src/etc/etc.sparc64/MAKEDEV.conf
cvs rdiff -u -r1.385.2.1.4.1 -r1.385.2.1.4.2 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r1.121.2.2 -r1.121.2.2.4.1 src/etc/mtree/special
cvs rdiff -u -r1.68.2.3 -r1.68.2.3.4.1 src/etc/rc.d/Makefile
cvs rdiff -u -r0 -r1.1.6.2 src/etc/rc.d/dhcpcd
cvs rdiff -u -r1.18 -r1.18.34.1 src/etc/rc.d/named
cvs rdiff -u -r1.57 -r1.57.8.1 src/etc/rc.d/network
cvs rdiff -u -r1.4 -r1.4.32.1 src/etc/ssh/ssh_known_hosts
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.113.2.6 src/etc/MAKEDEV.tmpl:1.113.2.6.4.1
--- src/etc/MAKEDEV.tmpl:1.113.2.6 Fri Jan 16 23:01:09 2009
+++ src/etc/MAKEDEV.tmpl Wed Apr 21 05:21:22 2010
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.113.2.6 2009/01/16 23:01:09 bouyer Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.113.2.6.4.1 2010/04/21 05:21:22 matt Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -236,6 +236,7 @@
# fb* PMAX generic framebuffer pseudo-device
# fd file descriptors
# grf* graphics frame buffer device
+# hdaudio* High Definition audio control device
# hil HP300 HIL input devices
# icp ICP-Vortex/Intel RAID control interface
# iic* IIC bus device
@@ -753,6 +754,7 @@
%MI_DEVICES_BEGIN%
audio)
makedev audio0 audio1 audio2 audio3
+ makedev hdaudio0 hdaudio1 hdaudio2 hdaudio3
lndev sound0 sound
lndev audio0 audio
lndev mixer0 mixer
@@ -1299,6 +1301,11 @@
mkdev $audioctl c %audio_chr% $(($unit + 192)) 666
;;
+hdaudio*)
+ unit=${i#hdaudio}
+ mkdev hdaudio$unit c %hdaudio_chr% $unit 644
+ ;;
+
gpio*)
unit=${i#gpio}
mkdev gpio$unit c %gpio_chr% $unit 644
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.359.2.3.4.1 src/etc/Makefile:1.359.2.3.4.2
--- src/etc/Makefile:1.359.2.3.4.1 Wed Sep 9 02:09:15 2009
+++ src/etc/Makefile Wed Apr 21 05:21:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.359.2.3.4.1 2009/09/09 02:09:15 matt Exp $
+# $NetBSD: Makefile,v 1.359.2.3.4.2 2010/04/21 05:21:22 matt Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -88,7 +88,7 @@
BINOWN= root
BINGRP= wheel
UTMPGRP= utmp
-BIN1+= audit-packages.conf bootptab changelist csh.cshrc csh.login \
+BIN1+= bootptab changelist csh.cshrc csh.login \
csh.logout daily daily.conf dm.conf envsys.conf floppytab ftpchroot \
ftpusers gettytab group hosts hosts.lpd inetd.conf lkm.conf \
locate.conf login.conf mailer.conf man.conf monthly monthly.conf \
@@ -305,7 +305,7 @@
${BINOWN} operator 664 /etc/dumpdates \
${BINOWN} operator 600 /etc/skeykeys \
root wheel 600 /var/at/at.deny \
- nobody ${BINGRP} 664 /var/db/locate.database \
+ root wheel 644 /var/db/locate.database \
${BINOWN} ${BINGRP} 600 /var/log/authlog \
root wheel 600 /var/log/cron \
${BINOWN} ${UTMPGRP} 664 /var/log/lastlog \
@@ -351,7 +351,7 @@
${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.bin/ssh configinstall
.endif
.if (${MKPOSTFIX} != "no")
- ${MAKEDIRTARGET} ${NETBSDSRCDIR}/gnu/usr.sbin/postfix configinstall
+ ${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/ibm-public/postfix configinstall
.endif
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.3.4.1
--- src/etc/defaults/rc.conf:1.95.2.3 Thu Mar 26 17:45:38 2009
+++ src/etc/defaults/rc.conf Wed Apr 21 05:21:23 2010
@@ -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.3.4.1 2010/04/21 05:21:23 matt 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
@@ -232,7 +233,7 @@
gated=NO
mrouted=NO mrouted_flags=""
route6d=NO route6d_flags=""
-rtsold=NO rtsold_flags="" # for ip6mode=autohost only
+rtsold=NO rtsold_flags="-a" # for ip6mode=autohost only
# Daemons used to boot other hosts over a network.
#
Index: src/etc/etc.i386/Makefile.inc
diff -u src/etc/etc.i386/Makefile.inc:1.59 src/etc/etc.i386/Makefile.inc:1.59.8.1
--- src/etc/etc.i386/Makefile.inc:1.59 Sun May 11 12:31:45 2008
+++ src/etc/etc.i386/Makefile.inc Wed Apr 21 05:21:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.59 2008/05/11 12:31:45 chris Exp $
+# $NetBSD: Makefile.inc,v 1.59.8.1 2010/04/21 05:21:23 matt Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -11,6 +11,7 @@
KERNEL_SETS+= XEN2_DOMU
KERNEL_SETS+= XEN3_DOM0
KERNEL_SETS+= XEN3_DOMU
+KERNEL_SETS+= XEN3PAE_DOM0
KERNEL_SETS+= XEN3PAE_DOMU
# KERNEL_SETS+= GENERIC_TINY
# KERNEL_SETS+= GENERIC_PS2TINY
Index: src/etc/etc.sparc/ttys
diff -u src/etc/etc.sparc/ttys:1.14 src/etc/etc.sparc/ttys:1.14.6.1
--- src/etc/etc.sparc/ttys:1.14 Tue Oct 7 10:00:02 2008
+++ src/etc/etc.sparc/ttys Wed Apr 21 05:21:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ttys,v 1.14 2008/10/07 10:00:02 abs Exp $
+# $NetBSD: ttys,v 1.14.6.1 2010/04/21 05:21:23 matt Exp $
#
# @(#)ttys 5.1 (Berkeley) 4/17/89
#
Index: src/etc/etc.sparc64/MAKEDEV.conf
diff -u src/etc/etc.sparc64/MAKEDEV.conf:1.13 src/etc/etc.sparc64/MAKEDEV.conf:1.13.8.1
--- src/etc/etc.sparc64/MAKEDEV.conf:1.13 Sat Sep 13 11:46:18 2008
+++ src/etc/etc.sparc64/MAKEDEV.conf Wed Apr 21 05:21:23 2010
@@ -1,7 +1,8 @@
-# $NetBSD: MAKEDEV.conf,v 1.13 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.13.8.1 2010/04/21 05:21:23 matt Exp $
all_md)
- makedev std_sparc64 ttya ttyb ttyc ttyd ttyC00 ttyC01 ttyh0 ttyh1
+ makedev std_sparc64 ttya ttyb ttyc ttyd ttyC00 ttyC01
+ makedev ttyh0 ttyh1 ttyh2 ttyh3
makedev sd0 sd1 sd2 sd3 sd4 ss0 ch0 uk0 uk1
makedev wd0 wd1 wd2 wd3 cd0 st0 st1 fd0
makedev audio
Index: src/etc/mtree/NetBSD.dist
diff -u src/etc/mtree/NetBSD.dist:1.385.2.1.4.1 src/etc/mtree/NetBSD.dist:1.385.2.1.4.2
--- src/etc/mtree/NetBSD.dist:1.385.2.1.4.1 Mon Dec 14 06:40:04 2009
+++ src/etc/mtree/NetBSD.dist Wed Apr 21 05:21:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist,v 1.385.2.1.4.1 2009/12/14 06:40:04 mrg Exp $
+# $NetBSD: NetBSD.dist,v 1.385.2.1.4.2 2010/04/21 05:21:23 matt Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -33,6 +33,7 @@
./etc/defaults
./etc/fonts
./etc/fonts/conf.d
+./etc/fonts/conf.avail
./etc/iscsi
./etc/kerberosV
./etc/mail
@@ -251,7 +252,6 @@
./usr/X11R7/include/GL
./usr/X11R7/include/GL/internal
./usr/X11R7/include/X11
-./usr/X11R7/include/X11/drm
./usr/X11R7/include/X11/dri
./usr/X11R7/include/X11/ICE
./usr/X11R7/include/X11/PM
@@ -267,6 +267,7 @@
./usr/X11R7/include/X11/extensions
./usr/X11R7/include/X11/fonts
./usr/X11R7/include/X11/pixmaps
+./usr/X11R7/include/drm
./usr/X11R7/include/fontconfig
./usr/X11R7/include/freetype2
./usr/X11R7/include/freetype2/freetype
@@ -362,32 +363,28 @@
./usr/X11R7/lib/X11/xedit/lisp/progmodes
./usr/X11R7/lib/X11/xkb
./usr/X11R7/lib/X11/xkb/compat
-./usr/X11R7/lib/X11/xkb/compiled
./usr/X11R7/lib/X11/xkb/geometry
-./usr/X11R7/lib/X11/xkb/geometry/digital
-./usr/X11R7/lib/X11/xkb/geometry/ibm
-./usr/X11R7/lib/X11/xkb/geometry/sgi
+./usr/X11R7/lib/X11/xkb/geometry/digital_vndr
+./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr
./usr/X11R7/lib/X11/xkb/keycodes
-./usr/X11R7/lib/X11/xkb/keycodes/digital
-./usr/X11R7/lib/X11/xkb/keycodes/sgi
+./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr
+./usr/X11R7/lib/X11/xkb/keycodes/sgi_vndr
./usr/X11R7/lib/X11/xkb/keymap
-./usr/X11R7/lib/X11/xkb/keymap/digital
-./usr/X11R7/lib/X11/xkb/keymap/sgi
-./usr/X11R7/lib/X11/xkb/keymap/sun
+./usr/X11R7/lib/X11/xkb/keymap/digital_vndr
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr
./usr/X11R7/lib/X11/xkb/rules
./usr/X11R7/lib/X11/xkb/semantics
./usr/X11R7/lib/X11/xkb/symbols
-./usr/X11R7/lib/X11/xkb/symbols/digital
-./usr/X11R7/lib/X11/xkb/symbols/fujitsu
-./usr/X11R7/lib/X11/xkb/symbols/hp
-./usr/X11R7/lib/X11/xkb/symbols/macintosh
-./usr/X11R7/lib/X11/xkb/symbols/nec
-./usr/X11R7/lib/X11/xkb/symbols/pc
-./usr/X11R7/lib/X11/xkb/symbols/sgi
-./usr/X11R7/lib/X11/xkb/symbols/sharp
-./usr/X11R7/lib/X11/xkb/symbols/sony
-./usr/X11R7/lib/X11/xkb/symbols/sun
-./usr/X11R7/lib/X11/xkb/symbols/xfree68
+./usr/X11R7/lib/X11/xkb/symbols/digital_vndr
+./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr
+./usr/X11R7/lib/X11/xkb/symbols/hp_vndr
+./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr
+./usr/X11R7/lib/X11/xkb/symbols/nec_vndr
+./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr
+./usr/X11R7/lib/X11/xkb/symbols/sony_vndr
+./usr/X11R7/lib/X11/xkb/symbols/sun_vndr
+./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr
./usr/X11R7/lib/X11/xkb/torture
./usr/X11R7/lib/X11/xkb/types
./usr/X11R7/lib/modules
@@ -397,6 +394,7 @@
./usr/X11R7/lib/modules/drivers
./usr/X11R7/lib/modules/input
./usr/X11R7/lib/pkgconfig
+./usr/X11R7/lib/xorg
./usr/X11R7/libexec
./usr/X11R7/man
./usr/X11R7/man/cat1
@@ -417,6 +415,7 @@
./usr/X11R7/share
./usr/X11R7/share/examples
./usr/X11R7/share/examples/ssh-askpass
+./usr/X11R7/share/pciids
./usr/bin
./usr/games
./usr/games/hide gname=games mode=0750
@@ -865,18 +864,26 @@
./usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES
./usr/share/locale/fr_BE.ISO8859-15
./usr/share/locale/fr_BE.ISO8859-15/LC_MESSAGES
+./usr/share/locale/fr_BE.UTF-8
+./usr/share/locale/fr_BE.UTF-8/LC_MESSAGES
./usr/share/locale/fr_CA.ISO8859-1
./usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES
./usr/share/locale/fr_CA.ISO8859-15
./usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
+./usr/share/locale/fr_CA.UTF-8
+./usr/share/locale/fr_CA.UTF-8/LC_MESSAGES
./usr/share/locale/fr_CH.ISO8859-1
./usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES
./usr/share/locale/fr_CH.ISO8859-15
./usr/share/locale/fr_CH.ISO8859-15/LC_MESSAGES
+./usr/share/locale/fr_CH.UTF-8
+./usr/share/locale/fr_CH.UTF-8/LC_MESSAGES
./usr/share/locale/fr_FR.ISO8859-1
./usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES
./usr/share/locale/fr_FR.ISO8859-15
./usr/share/locale/fr_FR.ISO8859-15/LC_MESSAGES
+./usr/share/locale/fr_FR.UTF-8
+./usr/share/locale/fr_FR.UTF-8/LC_MESSAGES
./usr/share/locale/gl
./usr/share/locale/gl/LC_MESSAGES
./usr/share/locale/he
Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.121.2.2 src/etc/mtree/special:1.121.2.2.4.1
--- src/etc/mtree/special:1.121.2.2 Fri Feb 6 00:55:31 2009
+++ src/etc/mtree/special Wed Apr 21 05:21:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: special,v 1.121.2.2 2009/02/06 00:55:31 snj Exp $
+# $NetBSD: special,v 1.121.2.2.4.1 2010/04/21 05:21:24 matt Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@@ -152,7 +152,6 @@
./etc/postfix type=dir mode=0755 optional
./etc/postfix/main.cf type=file mode=0644 optional
./etc/postfix/master.cf type=file mode=0644 optional
-./etc/postfix/postfix-script type=file mode=0555 optional
./etc/powerd type=dir mode=0755 optional
./etc/powerd/scripts type=dir mode=0755 optional
./etc/powerd/scripts/acadapter type=file mode=0555 optional
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.3.4.1
--- src/etc/rc.d/Makefile:1.68.2.3 Fri Feb 6 00:51:41 2009
+++ src/etc/rc.d/Makefile Wed Apr 21 05:21:24 2010
@@ -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.3.4.1 2010/04/21 05:21:24 matt 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 \
Index: src/etc/rc.d/named
diff -u src/etc/rc.d/named:1.18 src/etc/rc.d/named:1.18.34.1
--- src/etc/rc.d/named:1.18 Tue Nov 29 21:07:25 2005
+++ src/etc/rc.d/named Wed Apr 21 05:21:24 2010
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: named,v 1.18 2005/11/29 21:07:25 christos Exp $
+# $NetBSD: named,v 1.18.34.1 2010/04/21 05:21:24 matt Exp $
#
# PROVIDE: named
@@ -31,7 +31,7 @@
f=${f##./}
case $f in
*/*)
- d=$dst$(dirname $f)
+ d=$dst/$(dirname $f)
;;
*) d=$dst
;;
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.57 src/etc/rc.d/network:1.57.8.1
--- src/etc/rc.d/network:1.57 Sat Oct 11 17:28:03 2008
+++ src/etc/rc.d/network Wed Apr 21 05:21:24 2010
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.57 2008/10/11 17:28:03 christos Exp $
+# $NetBSD: network,v 1.57.8.1 2010/04/21 05:21:24 matt Exp $
#
# PROVIDE: network
@@ -36,7 +36,9 @@
# DHCP later, as we will probably get the
# hostname at that time.
#
- if ! checkyesno dhclient && [ -z "$(hostname)" ]; then
+ if ! checkyesno dhclient && ! checkyesno dhcpcd && \
+ [ -z "$(hostname)" ]
+ then
warn "\$hostname not set."
fi
fi
@@ -266,7 +268,10 @@
( eval "${args#*!}" )
;;
dhcp)
- /sbin/dhcpcd -n ${dhcpcd_flags} $int
+ if ! checkyesno dhcpcd; then
+ /sbin/dhcpcd -n \
+ ${dhcpcd_flags} $int
+ fi
;;
*)
# Pass args to ifconfig. Note
@@ -442,7 +447,9 @@
eval args=\$ifconfig_$int
if [ -n "$args" ] || [ -f /etc/ifconfig.$int ]; then
echo -n " $int"
- /sbin/dhcpcd -k $int 2> /dev/null
+ if [ -f /var/run/dhcpcd-$int.pid ]; then
+ /sbin/dhcpcd -k $int 2> /dev/null
+ fi
/sbin/ifconfig $int down
if /sbin/ifconfig $int destroy 2>/dev/null && \
checkyesno ipfilter; then
@@ -462,5 +469,6 @@
load_rc_config $name
load_rc_config_var dhclient dhclient
+load_rc_config_var dhcpcd dhcpcd
load_rc_config_var ipfilter ipfilter
run_rc_command "$1"
Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.4 src/etc/ssh/ssh_known_hosts:1.4.32.1
--- src/etc/ssh/ssh_known_hosts:1.4 Tue Sep 26 21:57:06 2006
+++ src/etc/ssh/ssh_known_hosts Wed Apr 21 05:21:24 2010
@@ -1,12 +1,27 @@
-# $NetBSD: ssh_known_hosts,v 1.4 2006/09/26 21:57:06 tron Exp $
+# $NetBSD: ssh_known_hosts,v 1.4.32.1 2010/04/21 05:21:24 matt Exp $
#
-anoncvs.netbsd.org 1024 33 124527836847225907702134616704062642655823674633646867489991942489052722003567896405835432181052901730304969527126160762854542328265293874791858398238222787853274712973179184350617008506840396224723739301126809289775083202762136105883911120059428253653584248682397589937086051061126544879545951581690785060623
anoncvs.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
-cvs.netbsd.org,cvs4.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk=
+cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk=
-ftp.netbsd.org,ftp4.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E=
+ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc=
mail.netbsd.org,homeworld.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
+
+pkgbuild.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0=
+
+build.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc=
+
+blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
+
+mollari.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
+
+garibaldi.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA7CW/T6MxwXi2qAQSGnSRXqwlwhrKsKVj3VKbsPpFf3fg28259fpqBYHgE4qWlhxg/wEtHoMaxRee1H3KaQwj88ez4fYMgDRkDgFY+NlwII/vgeFFKvjZvzsmfLP75uXC9YS/AlagHmIeubu4ymlgQ29fpwacKmrgCLTrEIXMHPc=
+
+babylon5.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E=
+
+morden.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc=
+
+narn.netbsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
Added files:
Index: src/etc/rc.d/dhcpcd
diff -u /dev/null src/etc/rc.d/dhcpcd:1.1.6.2
--- /dev/null Wed Apr 21 05:21:25 2010
+++ src/etc/rc.d/dhcpcd Wed Apr 21 05:21:24 2010
@@ -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"
