Module Name: src
Committed By: joerg
Date: Tue Apr 7 11:49:18 UTC 2009
Modified Files:
src/distrib/amd64/ramdisks/common: Makefile.ramdisk
src/distrib/amd64/ramdisks/ramdisk: Makefile list
src/distrib/cats/ramdisk: Makefile list
src/distrib/common: mtree.common
src/distrib/evbarm/instkernel/ramdisk: Makefile list
src/distrib/hpcarm/miniroot: Makefile.inc list
src/distrib/hpcmips/miniroot: Makefile.inc list
src/distrib/i386/ramdisks/ramdisk-big: Makefile list
src/distrib/landisk/ramdisk: Makefile list
src/distrib/mac68k/instkernel/ramdisk: Makefile list
src/distrib/ofppc/ramdisks/common: Makefile.ramdisk
src/distrib/ofppc/ramdisks/ramdisk: Makefile list
src/distrib/sgimips/ramdisk: Makefile list
src/distrib/shark/instkernel/ramdisk: Makefile list
src/distrib/sparc64/instfs: Makefile list
src/distrib/utils/sysinst: net.c
src/distrib/zaurus/ramdisk: Makefile list
Added Files:
src/distrib/common: 10-resolv.conf 99-print-sysinst Makefile.dhcpcd
list.dhcpcd
Log Message:
Change ramdisks from dhclient to dhcpcd and add corresponding glue to
sysinst. For amd64, the crunchgen binary shrinks by 150KB uncompresssed,
60KB compressed.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/ramdisks/ramdisk/Makefile
cvs rdiff -u -r1.8 -r1.9 src/distrib/amd64/ramdisks/ramdisk/list
cvs rdiff -u -r1.12 -r1.13 src/distrib/cats/ramdisk/Makefile
cvs rdiff -u -r1.11 -r1.12 src/distrib/cats/ramdisk/list
cvs rdiff -u -r0 -r1.1 src/distrib/common/10-resolv.conf \
src/distrib/common/99-print-sysinst src/distrib/common/Makefile.dhcpcd \
src/distrib/common/list.dhcpcd
cvs rdiff -u -r1.8 -r1.9 src/distrib/common/mtree.common
cvs rdiff -u -r1.5 -r1.6 src/distrib/evbarm/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.8 -r1.9 src/distrib/evbarm/instkernel/ramdisk/list
cvs rdiff -u -r1.1 -r1.2 src/distrib/hpcarm/miniroot/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/distrib/hpcarm/miniroot/list
cvs rdiff -u -r1.14 -r1.15 src/distrib/hpcmips/miniroot/Makefile.inc
cvs rdiff -u -r1.10 -r1.11 src/distrib/hpcmips/miniroot/list
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/ramdisks/ramdisk-big/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/i386/ramdisks/ramdisk-big/list
cvs rdiff -u -r1.2 -r1.3 src/distrib/landisk/ramdisk/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/landisk/ramdisk/list
cvs rdiff -u -r1.29 -r1.30 src/distrib/mac68k/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.20 -r1.21 src/distrib/mac68k/instkernel/ramdisk/list
cvs rdiff -u -r1.2 -r1.3 src/distrib/ofppc/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.1 -r1.2 src/distrib/ofppc/ramdisks/ramdisk/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/ofppc/ramdisks/ramdisk/list
cvs rdiff -u -r1.11 -r1.12 src/distrib/sgimips/ramdisk/Makefile
cvs rdiff -u -r1.9 -r1.10 src/distrib/sgimips/ramdisk/list
cvs rdiff -u -r1.14 -r1.15 src/distrib/shark/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.11 -r1.12 src/distrib/shark/instkernel/ramdisk/list
cvs rdiff -u -r1.12 -r1.13 src/distrib/sparc64/instfs/Makefile
cvs rdiff -u -r1.9 -r1.10 src/distrib/sparc64/instfs/list
cvs rdiff -u -r1.121 -r1.122 src/distrib/utils/sysinst/net.c
cvs rdiff -u -r1.3 -r1.4 src/distrib/zaurus/ramdisk/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/zaurus/ramdisk/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.4 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.5
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.4 Sun Jan 25 22:08:37 2009
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Tue Apr 7 11:49:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.4 2009/01/25 22:08:37 abs Exp $
+# $NetBSD: Makefile.ramdisk,v 1.5 2009/04/07 11:49:16 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -39,6 +39,7 @@
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
Index: src/distrib/amd64/ramdisks/ramdisk/Makefile
diff -u src/distrib/amd64/ramdisks/ramdisk/Makefile:1.1 src/distrib/amd64/ramdisks/ramdisk/Makefile:1.2
--- src/distrib/amd64/ramdisks/ramdisk/Makefile:1.1 Fri Jun 2 22:11:52 2006
+++ src/distrib/amd64/ramdisks/ramdisk/Makefile Tue Apr 7 11:49:16 2009
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2006/06/02 22:11:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/07 11:49:16 joerg Exp $
IMAGE= ramdisk.fs
IMAGESIZE= 5000k
-IMAGEDEPENDS= disktab.preinstall \
- ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script
+IMAGEDEPENDS= disktab.preinstall
USE_SYSINST= yes
SMALLPROG_INET6=1
Index: src/distrib/amd64/ramdisks/ramdisk/list
diff -u src/distrib/amd64/ramdisks/ramdisk/list:1.8 src/distrib/amd64/ramdisks/ramdisk/list:1.9
--- src/distrib/amd64/ramdisks/ramdisk/list:1.8 Tue Nov 4 14:21:39 2008
+++ src/distrib/amd64/ramdisks/ramdisk/list Tue Apr 7 11:49:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.8 2008/11/04 14:21:39 joerg Exp $
+# $NetBSD: list,v 1.9 2009/04/07 11:49:16 joerg Exp $
#
SRCDIRS usr.bin/less
@@ -24,7 +24,6 @@
PROG libexec/lfs_cleanerd
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/dmesg
PROG sbin/fdisk
@@ -67,15 +66,11 @@
PROG usr/sbin/chroot
PROG usr/sbin/wiconfig
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop
-# various files that we need in /etc for the install
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
-
# the disktab explanation file
COPY ${CURDIR}/disktab.preinstall etc/disktab.preinstall
Index: src/distrib/cats/ramdisk/Makefile
diff -u src/distrib/cats/ramdisk/Makefile:1.12 src/distrib/cats/ramdisk/Makefile:1.13
--- src/distrib/cats/ramdisk/Makefile:1.12 Sun Jan 25 22:08:37 2009
+++ src/distrib/cats/ramdisk/Makefile Tue Apr 7 11:49:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/01/25 22:08:37 abs Exp $
+# $NetBSD: Makefile,v 1.13 2009/04/07 11:49:16 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -31,6 +31,7 @@
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
Index: src/distrib/cats/ramdisk/list
diff -u src/distrib/cats/ramdisk/list:1.11 src/distrib/cats/ramdisk/list:1.12
--- src/distrib/cats/ramdisk/list:1.11 Sun Jan 25 22:08:37 2009
+++ src/distrib/cats/ramdisk/list Tue Apr 7 11:49:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.11 2009/01/25 22:08:37 abs Exp $
+# $NetBSD: list,v 1.12 2009/04/07 11:49:16 joerg Exp $
# usr.bin/less has to be first, otherwise the ramdisk.mk generation fails
SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin gnu/usr.bin
@@ -22,7 +22,6 @@
PROG bin/stty
PROG bin/sync
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/fsck
PROG sbin/fsck_ffs
@@ -59,7 +58,6 @@
# init invokes the shell as -sh
ARGVLN sh -sh
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
@@ -67,10 +65,6 @@
LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop
# various files that we need in /etc for the install
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
-
-
-# various files that we need in /etc for the install
COPY ${NETBSDSRCDIR}/etc/group etc/group
COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
Index: src/distrib/common/mtree.common
diff -u src/distrib/common/mtree.common:1.8 src/distrib/common/mtree.common:1.9
--- src/distrib/common/mtree.common:1.8 Fri Aug 24 17:11:58 2007
+++ src/distrib/common/mtree.common Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mtree.common,v 1.8 2007/08/24 17:11:58 skd Exp $
+# $NetBSD: mtree.common,v 1.9 2009/04/07 11:49:17 joerg Exp $
/set type=dir uname=root gname=wheel mode=0755
@@ -7,6 +7,7 @@
./dev
./etc
./libexec
+./libexec/dhcpcd-hooks
./mnt
./mnt2
./kern
Index: src/distrib/evbarm/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.5 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.6
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.5 Sun Jan 25 22:08:37 2009
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/01/25 22:08:37 abs Exp $
+# $NetBSD: Makefile,v 1.6 2009/04/07 11:49:17 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -28,6 +28,7 @@
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
Index: src/distrib/evbarm/instkernel/ramdisk/list
diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.8 src/distrib/evbarm/instkernel/ramdisk/list:1.9
--- src/distrib/evbarm/instkernel/ramdisk/list:1.8 Sun Jan 25 22:08:37 2009
+++ src/distrib/evbarm/instkernel/ramdisk/list Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.8 2009/01/25 22:08:37 abs Exp $
+# $NetBSD: list,v 1.9 2009/04/07 11:49:17 joerg Exp $
SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
@@ -20,7 +20,6 @@
PROG bin/stty
PROG bin/sync
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/fsck
PROG sbin/fsck_ffs
@@ -53,7 +52,6 @@
PROG usr/sbin/chown usr/bin/chgrp
PROG usr/sbin/chroot
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ed srcdir distrib/utils/x_ed
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
@@ -69,7 +67,6 @@
#COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot
# various files that we need in /etc for the install
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
COPY ${NETBSDSRCDIR}/etc/group etc/group
COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
Index: src/distrib/hpcarm/miniroot/Makefile.inc
diff -u src/distrib/hpcarm/miniroot/Makefile.inc:1.1 src/distrib/hpcarm/miniroot/Makefile.inc:1.2
--- src/distrib/hpcarm/miniroot/Makefile.inc:1.1 Fri Dec 30 11:47:19 2005
+++ src/distrib/hpcarm/miniroot/Makefile.inc Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2005/12/30 11:47:19 rjs Exp $
+# $NetBSD: Makefile.inc,v 1.2 2009/04/07 11:49:17 joerg Exp $
DBG= -Os
@@ -11,3 +11,5 @@
IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${ARCHDIR}/termcap.vt100 \
${DESTDIR}/.profile ${DESTDIR}/etc/disktab
SMALLPROG_INET6=1
+
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
Index: src/distrib/hpcarm/miniroot/list
diff -u src/distrib/hpcarm/miniroot/list:1.2 src/distrib/hpcarm/miniroot/list:1.3
--- src/distrib/hpcarm/miniroot/list:1.2 Thu Oct 30 12:39:16 2008
+++ src/distrib/hpcarm/miniroot/list Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.2 2008/10/30 12:39:16 tsutsui Exp $
+# $NetBSD: list,v 1.3 2009/04/07 11:49:17 joerg Exp $
# extras in bin
PROG bin/csh
@@ -7,7 +7,6 @@
PROG bin/rcmd
# extras in sbin
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/fdisk
PROG sbin/mount_ext2fs
@@ -22,7 +21,6 @@
PROG usr/bin/vi
# crunchgen source directory specials: progs built in nonstandard places
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL vi srcdir usr.bin/nvi/build
# Minimize use of MFS
@@ -39,6 +37,3 @@
# and a spare .profile
COPY ${DESTDIR}/.profile tmp/.hdprofile
-
-# various files that we need in /etc for the install
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
Index: src/distrib/hpcmips/miniroot/Makefile.inc
diff -u src/distrib/hpcmips/miniroot/Makefile.inc:1.14 src/distrib/hpcmips/miniroot/Makefile.inc:1.15
--- src/distrib/hpcmips/miniroot/Makefile.inc:1.14 Thu Apr 10 15:01:52 2003
+++ src/distrib/hpcmips/miniroot/Makefile.inc Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2003/04/10 15:01:52 he Exp $
+# $NetBSD: Makefile.inc,v 1.15 2009/04/07 11:49:17 joerg Exp $
DBG= -Os
@@ -11,3 +11,5 @@
IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${ARCHDIR}/termcap.vt100 \
${DESTDIR}/.profile ${DESTDIR}/etc/disktab
SMALLPROG_INET6=1
+
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
Index: src/distrib/hpcmips/miniroot/list
diff -u src/distrib/hpcmips/miniroot/list:1.10 src/distrib/hpcmips/miniroot/list:1.11
--- src/distrib/hpcmips/miniroot/list:1.10 Thu Oct 30 12:39:16 2008
+++ src/distrib/hpcmips/miniroot/list Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.10 2008/10/30 12:39:16 tsutsui Exp $
+# $NetBSD: list,v 1.11 2009/04/07 11:49:17 joerg Exp $
# extras in bin
PROG bin/csh
@@ -7,7 +7,6 @@
PROG bin/rcmd
# extras in sbin
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/fdisk
PROG sbin/mount_ext2fs
@@ -22,7 +21,6 @@
PROG usr/bin/vi
# crunchgen source directory specials: progs built in nonstandard places
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL vi srcdir usr.bin/nvi/build
# Minimize use of MFS
@@ -39,6 +37,3 @@
# and a spare .profile
COPY ${DESTDIR}/.profile tmp/.hdprofile
-
-# various files that we need in /etc for the install
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
Index: src/distrib/i386/ramdisks/ramdisk-big/Makefile
diff -u src/distrib/i386/ramdisks/ramdisk-big/Makefile:1.1 src/distrib/i386/ramdisks/ramdisk-big/Makefile:1.2
--- src/distrib/i386/ramdisks/ramdisk-big/Makefile:1.1 Fri Jun 2 22:11:07 2006
+++ src/distrib/i386/ramdisks/ramdisk-big/Makefile Tue Apr 7 11:49:17 2009
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2006/06/02 22:11:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/07 11:49:17 joerg Exp $
BOOTMODEL= big
IMAGE= ramdisk-${BOOTMODEL}.fs
IMAGESIZE= 5000k
-IMAGEDEPENDS= disktab.preinstall \
- ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script
+IMAGEDEPENDS= disktab.preinstall
USE_SYSINST= yes
SMALLPROG_INET6=1
.include "${.CURDIR}/../common/Makefile.ramdisk"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.if ${USE_INET6} != "no"
LISTS+= ${.CURDIR}/list.inet6
Index: src/distrib/i386/ramdisks/ramdisk-big/list
diff -u src/distrib/i386/ramdisks/ramdisk-big/list:1.2 src/distrib/i386/ramdisks/ramdisk-big/list:1.3
--- src/distrib/i386/ramdisks/ramdisk-big/list:1.2 Sat Nov 18 16:09:57 2006
+++ src/distrib/i386/ramdisks/ramdisk-big/list Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.2 2006/11/18 16:09:57 dsl Exp $
+# $NetBSD: list,v 1.3 2009/04/07 11:49:17 joerg Exp $
#
PROG bin/chio
@@ -9,7 +9,6 @@
PROG bin/rcmd
PROG bin/sync
-PROG sbin/dhclient
PROG sbin/fdisk
PROG sbin/mount_ext2fs
PROG sbin/mount_ntfs
@@ -27,10 +26,5 @@
PROG usr/sbin/wiconfig
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
-
-# various files that we need in /etc for the install
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
-
# the disktab explanation file
COPY ${CURDIR}/disktab.preinstall etc/disktab.preinstall
Index: src/distrib/landisk/ramdisk/Makefile
diff -u src/distrib/landisk/ramdisk/Makefile:1.2 src/distrib/landisk/ramdisk/Makefile:1.3
--- src/distrib/landisk/ramdisk/Makefile:1.2 Sun Jan 25 22:08:38 2009
+++ src/distrib/landisk/ramdisk/Makefile Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/01/25 22:08:38 abs Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/07 11:49:17 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -31,6 +31,7 @@
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
Index: src/distrib/landisk/ramdisk/list
diff -u src/distrib/landisk/ramdisk/list:1.3 src/distrib/landisk/ramdisk/list:1.4
--- src/distrib/landisk/ramdisk/list:1.3 Tue Mar 10 02:11:57 2009
+++ src/distrib/landisk/ramdisk/list Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.3 2009/03/10 02:11:57 uwe Exp $
+# $NetBSD: list,v 1.4 2009/04/07 11:49:17 joerg Exp $
SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin
@@ -19,7 +19,6 @@
PROG bin/stty
PROG bin/sync
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/fdisk
PROG sbin/fsck
@@ -47,7 +46,6 @@
PROG usr/sbin/chroot
PROG usr/sbin/installboot
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ed srcdir distrib/utils/x_ed
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
@@ -60,7 +58,6 @@
ARGVLN sh -sh
# various files that we need in /etc for the install
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
COPY ${NETBSDSRCDIR}/etc/group etc/group
COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd
COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols
Index: src/distrib/mac68k/instkernel/ramdisk/Makefile
diff -u src/distrib/mac68k/instkernel/ramdisk/Makefile:1.29 src/distrib/mac68k/instkernel/ramdisk/Makefile:1.30
--- src/distrib/mac68k/instkernel/ramdisk/Makefile:1.29 Sun Jan 25 22:08:38 2009
+++ src/distrib/mac68k/instkernel/ramdisk/Makefile Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/01/25 22:08:38 abs Exp $
+# $NetBSD: Makefile,v 1.30 2009/04/07 11:49:17 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -34,6 +34,7 @@
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
Index: src/distrib/mac68k/instkernel/ramdisk/list
diff -u src/distrib/mac68k/instkernel/ramdisk/list:1.20 src/distrib/mac68k/instkernel/ramdisk/list:1.21
--- src/distrib/mac68k/instkernel/ramdisk/list:1.20 Sun Jan 25 22:08:38 2009
+++ src/distrib/mac68k/instkernel/ramdisk/list Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.20 2009/01/25 22:08:38 abs Exp $
+# $NetBSD: list,v 1.21 2009/04/07 11:49:17 joerg Exp $
SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin gnu/usr.bin/binutils
@@ -21,7 +21,6 @@
PROG bin/stty
PROG bin/sync
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/fsck
PROG sbin/fsck_ffs
@@ -58,7 +57,6 @@
# init invokes the shell as -sh
ARGVLN sh -sh
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ed srcdir distrib/utils/x_ed
SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
@@ -76,8 +74,6 @@
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
COPY ${NETBSDSRCDIR}/distrib/common/services etc/services
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
-
# and the common installation tools
COPY ${DISTRIBDIR}/mac68k/miniroot/termcap usr/share/misc/termcap
Index: src/distrib/ofppc/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/ofppc/ramdisks/common/Makefile.ramdisk:1.2 src/distrib/ofppc/ramdisks/common/Makefile.ramdisk:1.3
--- src/distrib/ofppc/ramdisks/common/Makefile.ramdisk:1.2 Sun Jan 25 22:08:38 2009
+++ src/distrib/ofppc/ramdisks/common/Makefile.ramdisk Tue Apr 7 11:49:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.2 2009/01/25 22:08:38 abs Exp $
+# $NetBSD: Makefile.ramdisk,v 1.3 2009/04/07 11:49:17 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -36,6 +36,7 @@
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
Index: src/distrib/ofppc/ramdisks/ramdisk/Makefile
diff -u src/distrib/ofppc/ramdisks/ramdisk/Makefile:1.1 src/distrib/ofppc/ramdisks/ramdisk/Makefile:1.2
--- src/distrib/ofppc/ramdisks/ramdisk/Makefile:1.1 Wed Jan 2 11:39:04 2008
+++ src/distrib/ofppc/ramdisks/ramdisk/Makefile Tue Apr 7 11:49:18 2009
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2008/01/02 11:39:04 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/07 11:49:18 joerg Exp $
IMAGE= ramdisk.fs
IMAGESIZE= 5000k
-IMAGEDEPENDS= ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script
USE_SYSINST= yes
SMALLPROG_INET6=1
Index: src/distrib/ofppc/ramdisks/ramdisk/list
diff -u src/distrib/ofppc/ramdisks/ramdisk/list:1.3 src/distrib/ofppc/ramdisks/ramdisk/list:1.4
--- src/distrib/ofppc/ramdisks/ramdisk/list:1.3 Thu Oct 30 12:39:16 2008
+++ src/distrib/ofppc/ramdisks/ramdisk/list Tue Apr 7 11:49:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.3 2008/10/30 12:39:16 tsutsui Exp $
+# $NetBSD: list,v 1.4 2009/04/07 11:49:18 joerg Exp $
#
SRCDIRS usr.bin/less
@@ -24,7 +24,6 @@
PROG libexec/lfs_cleanerd
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/fdisk
PROG sbin/fsck
@@ -66,13 +65,9 @@
PROG usr/sbin/chroot
PROG usr/sbin/wiconfig
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
SPECIAL vi srcdir usr.bin/nvi/build
LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop
-
-# various files that we need in /etc for the install
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
Index: src/distrib/sgimips/ramdisk/Makefile
diff -u src/distrib/sgimips/ramdisk/Makefile:1.11 src/distrib/sgimips/ramdisk/Makefile:1.12
--- src/distrib/sgimips/ramdisk/Makefile:1.11 Sun Jan 25 22:08:38 2009
+++ src/distrib/sgimips/ramdisk/Makefile Tue Apr 7 11:49:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/01/25 22:08:38 abs Exp $
+# $NetBSD: Makefile,v 1.12 2009/04/07 11:49:18 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -33,6 +33,7 @@
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
Index: src/distrib/sgimips/ramdisk/list
diff -u src/distrib/sgimips/ramdisk/list:1.9 src/distrib/sgimips/ramdisk/list:1.10
--- src/distrib/sgimips/ramdisk/list:1.9 Sun Jan 25 22:08:38 2009
+++ src/distrib/sgimips/ramdisk/list Tue Apr 7 11:49:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.9 2009/01/25 22:08:38 abs Exp $
+# $NetBSD: list,v 1.10 2009/04/07 11:49:18 joerg Exp $
SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/sgimips/stand
@@ -19,7 +19,6 @@
PROG bin/stty
PROG bin/sync
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/fsck
PROG sbin/fsck_ffs
@@ -47,7 +46,6 @@
PROG usr/sbin/chown usr/bin/chgrp
PROG usr/sbin/chroot
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ed srcdir distrib/utils/x_ed
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
@@ -66,7 +64,6 @@
COPY ${DESTDIR}/usr/mdec/ip3xboot usr/mdec/ip3xboot
# various files that we need in /etc for the install
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
COPY ${NETBSDSRCDIR}/etc/group etc/group
COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd
COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols
Index: src/distrib/shark/instkernel/ramdisk/Makefile
diff -u src/distrib/shark/instkernel/ramdisk/Makefile:1.14 src/distrib/shark/instkernel/ramdisk/Makefile:1.15
--- src/distrib/shark/instkernel/ramdisk/Makefile:1.14 Sun Jan 25 22:08:38 2009
+++ src/distrib/shark/instkernel/ramdisk/Makefile Tue Apr 7 11:49:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/01/25 22:08:38 abs Exp $
+# $NetBSD: Makefile,v 1.15 2009/04/07 11:49:18 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -20,8 +20,7 @@
${DESTDIR}/usr/share/misc/termcap \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \
- ${NETBSDSRCDIR}/distrib/common/services \
- ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script
+ ${NETBSDSRCDIR}/distrib/common/services
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
@@ -29,6 +28,7 @@
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
Index: src/distrib/shark/instkernel/ramdisk/list
diff -u src/distrib/shark/instkernel/ramdisk/list:1.11 src/distrib/shark/instkernel/ramdisk/list:1.12
--- src/distrib/shark/instkernel/ramdisk/list:1.11 Sun Jan 25 22:08:39 2009
+++ src/distrib/shark/instkernel/ramdisk/list Tue Apr 7 11:49:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.11 2009/01/25 22:08:39 abs Exp $
+# $NetBSD: list,v 1.12 2009/04/07 11:49:18 joerg Exp $
SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
@@ -20,7 +20,6 @@
PROG bin/sync
PROG sbin/disklabel
-PROG sbin/dhclient
PROG sbin/fsck
PROG sbin/fsck_ffs
PROG sbin/ifconfig
@@ -56,7 +55,6 @@
# init invokes the shell as -sh
ARGVLN sh -sh
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ping srcdir distrib/utils/x_ping
LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop
@@ -70,7 +68,6 @@
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols
COPY ${NETBSDSRCDIR}/distrib/common/services etc/services
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
# and the common installation tools
COPY ${DESTDIR}/usr/share/misc/termcap usr/share/misc/termcap
Index: src/distrib/sparc64/instfs/Makefile
diff -u src/distrib/sparc64/instfs/Makefile:1.12 src/distrib/sparc64/instfs/Makefile:1.13
--- src/distrib/sparc64/instfs/Makefile:1.12 Wed Nov 22 20:54:16 2006
+++ src/distrib/sparc64/instfs/Makefile Tue Apr 7 11:49:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/11/22 20:54:16 martin Exp $
+# $NetBSD: Makefile,v 1.13 2009/04/07 11:49:18 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -21,6 +21,7 @@
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
.include "${DISTRIBDIR}/common/Makefile.mdset"
Index: src/distrib/sparc64/instfs/list
diff -u src/distrib/sparc64/instfs/list:1.9 src/distrib/sparc64/instfs/list:1.10
--- src/distrib/sparc64/instfs/list:1.9 Sun Jan 25 22:08:39 2009
+++ src/distrib/sparc64/instfs/list Tue Apr 7 11:49:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.9 2009/01/25 22:08:39 abs Exp $
+# $NetBSD: list,v 1.10 2009/04/07 11:49:18 joerg Exp $
SRCDIRS bin sbin libexec usr.bin/less usr.bin usr.sbin gnu/usr.bin
@@ -22,7 +22,6 @@
PROG bin/stty
PROG bin/sync
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/fsck
PROG sbin/fsck_ffs
@@ -70,7 +69,6 @@
ARGVLN sh -sh
SPECIAL chat srcdir usr.sbin/pppd/chat
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL pppd srcdir usr.sbin/pppd/pppd
@@ -86,8 +84,6 @@
COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols
COPY ${NETBSDSRCDIR}/distrib/common/services etc/services
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
-
# we need the boot block in /usr/mdec + the arch specific extras
COPY ${DESTDIR}/usr/mdec/binstall usr/mdec/binstall 555
COPY ${DESTDIR}/usr/mdec/bootblk usr/mdec/bootblk
Index: src/distrib/utils/sysinst/net.c
diff -u src/distrib/utils/sysinst/net.c:1.121 src/distrib/utils/sysinst/net.c:1.122
--- src/distrib/utils/sysinst/net.c:1.121 Tue Nov 25 14:25:20 2008
+++ src/distrib/utils/sysinst/net.c Tue Apr 7 11:49:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.121 2008/11/25 14:25:20 ad Exp $ */
+/* $NetBSD: net.c,v 1.122 2009/04/07 11:49:18 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -38,6 +38,7 @@
/* net.c -- routines to fetch files off the network. */
+#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -102,7 +103,7 @@
static void write_etc_hosts(FILE *f);
-#define DHCLIENT_EX "/sbin/dhclient"
+#define DHCPCD "/sbin/dhcpcd"
#include <signal.h>
static int config_dhcp(char *);
static void get_dhcp_value(char *, size_t, const char *);
@@ -1155,8 +1156,7 @@
add_rc_conf("defaultroute=\"%s\"\n", net_defroute);
} else {
- add_rc_conf("dhclient=YES\n");
- add_rc_conf("dhclient_flags=\"%s\"\n", net_dev);
+ add_rc_conf("ifconfig_%s=dhcp\n", net_dev);
}
#ifdef INET6
@@ -1181,73 +1181,55 @@
config_dhcp(char *inter)
{
int dhcpautoconf;
- int result;
- char *textbuf;
- int pid;
- /* check if dhclient is running, if so, kill it */
- result = collect(T_FILE, &textbuf, "/tmp/dhclient.pid");
- if (result >= 0) {
- pid = atoi(textbuf);
- if (pid > 0) {
- kill(pid, 15);
- sleep(1);
- kill(pid, 9);
- }
- }
- free(textbuf);
+ /*
+ * Don't bother checking for an existing instance of dhcpcd, just
+ * ask it to renew the lease. It will fork and daemonize if there
+ * wasn't already an instance.
+ */
- if (!file_mode_match(DHCLIENT_EX, S_IFREG))
+ if (!file_mode_match(DHCPCD, S_IFREG))
return 0;
process_menu(MENU_yesno, deconst(MSG_Perform_DHCP_autoconfiguration));
if (yesno) {
- /* spawn off dhclient and wait for parent to exit */
+ /* spawn off dhcpcd and wait for parent to exit */
dhcpautoconf = run_program(RUN_DISPLAY | RUN_PROGRESS,
- "%s -q -pf /tmp/dhclnt.pid -lf /tmp/dhclient.leases %s",
- DHCLIENT_EX, inter);
+ "%s -d -n %s", DHCPCD, inter);
return dhcpautoconf ? 0 : 1;
}
return 0;
}
static void
-get_dhcp_value(char *targ, size_t l, const char *line)
+get_dhcp_value(char *targ, size_t l, const char *var)
{
- int textsize;
- char *textbuf;
- char *t;
- char *walkp;
-
- textsize = collect(T_FILE, &textbuf, "/tmp/dhclient.leases");
- if (textsize < 0) {
- if (logging)
- (void)fprintf(logfp,
- "Could not open file /tmp/dhclient.leases.\n");
- (void)fprintf(stderr, "Could not open /tmp/dhclient.leases\n");
- /* not fatal, just assume value not found */
+ static const char *lease_data = "/tmp/dhcpcd-lease";
+ FILE *fp;
+ char *line;
+ size_t len, var_len;
+
+ if ((fp = fopen(lease_data, "r")) == NULL) {
+ warn("Could not open %s", lease_data);
+ *targ = '\0';
+ return;
}
- if (textsize >= 0) {
- (void)strtok(textbuf, " \t\n"); /* jump past 'lease' */
- while ((t = strtok(NULL, " \t\n")) != NULL) {
- if (strcmp(t, line) == 0) {
- t = strtok(NULL, " \t\n");
- /* found the tag, extract the value */
- /* last char should be a ';' */
- walkp = strrchr(t, ';');
- if (walkp != NULL) {
- *walkp = '\0';
- }
- /* strip any " from the string */
- walkp = strrchr(t, '"');
- if (walkp != NULL) {
- *walkp = '\0';
- t++;
- }
- strlcpy(targ, t, l);
- break;
- }
- }
+
+ var_len = strlen(var);
+
+ while ((line = fgetln(fp, &len)) != NULL) {
+ if (line[len - 1] == '\n')
+ --len;
+ if (len <= var_len)
+ continue;
+ if (memcmp(line, var, var_len))
+ continue;
+ if (line[var_len] != '=')
+ continue;
+ line += var_len + 1;
+ len -= var_len + 1;
+ strlcpy(targ, line, l > len ? len + 1: l);
+ break;
}
- free(textbuf);
- return;
+
+ fclose(fp);
}
Index: src/distrib/zaurus/ramdisk/Makefile
diff -u src/distrib/zaurus/ramdisk/Makefile:1.3 src/distrib/zaurus/ramdisk/Makefile:1.4
--- src/distrib/zaurus/ramdisk/Makefile:1.3 Sun Jan 25 22:08:39 2009
+++ src/distrib/zaurus/ramdisk/Makefile Tue Apr 7 11:49:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/01/25 22:08:39 abs Exp $
+# $NetBSD: Makefile,v 1.4 2009/04/07 11:49:18 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -31,6 +31,7 @@
${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
Index: src/distrib/zaurus/ramdisk/list
diff -u src/distrib/zaurus/ramdisk/list:1.4 src/distrib/zaurus/ramdisk/list:1.5
--- src/distrib/zaurus/ramdisk/list:1.4 Sun Jan 25 22:08:39 2009
+++ src/distrib/zaurus/ramdisk/list Tue Apr 7 11:49:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.4 2009/01/25 22:08:39 abs Exp $
+# $NetBSD: list,v 1.5 2009/04/07 11:49:18 joerg Exp $
# usr.bin/less has to be first, otherwise the ramdisk.mk generation fails
SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin gnu/usr.bin
@@ -22,7 +22,6 @@
PROG bin/stty
PROG bin/sync
-PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/fdisk
PROG sbin/fsck
@@ -60,7 +59,6 @@
# init invokes the shell as -sh
ARGVLN sh -sh
-SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
@@ -68,10 +66,6 @@
LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop
# various files that we need in /etc for the install
-COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
-
-
-# various files that we need in /etc for the install
COPY ${NETBSDSRCDIR}/etc/group etc/group
COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
Added files:
Index: src/distrib/common/10-resolv.conf
diff -u /dev/null src/distrib/common/10-resolv.conf:1.1
--- /dev/null Tue Apr 7 11:49:19 2009
+++ src/distrib/common/10-resolv.conf Tue Apr 7 11:49:17 2009
@@ -0,0 +1,22 @@
+# Minimal version using shell builtins.
+
+make_resolv_conf()
+{
+ if [ -z "${new_domain_name_servers}" -a \
+ -z "${new_domain_name}" -a \
+ -z "${new_domain_search}" ]; then
+ return 0
+ fi
+ if [ -n "${new_domain_search}" ]; then
+ echo "search ${new_domain_search}" >> /etc/resolv.conf
+ elif [ -n "${new_domain_name}" ]; then
+ echo "search ${new_domain_name}" >> /etc/resolv.conf
+ fi
+ for x in ${new_domain_name_servers}; do
+ echo "nameserver ${x}" >> /etc/resolv.conf
+ done
+}
+
+case "${reason}" in
+BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) make_resolv_conf;;
+esac
Index: src/distrib/common/99-print-sysinst
diff -u /dev/null src/distrib/common/99-print-sysinst:1.1
--- /dev/null Tue Apr 7 11:49:19 2009
+++ src/distrib/common/99-print-sysinst Tue Apr 7 11:49:17 2009
@@ -0,0 +1,11 @@
+# $NetBSD: 99-print-sysinst,v 1.1 2009/04/07 11:49:17 joerg Exp $
+
+case "${reason}" in
+BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT)
+ cat > /tmp/dhcpcd-lease << EOF
+host-name=${new_host_name}
+domain-name=${new_domain_name}
+EOF
+ set > /tmp/dhcpcd-lease-all
+ ;;
+esac
Index: src/distrib/common/Makefile.dhcpcd
diff -u /dev/null src/distrib/common/Makefile.dhcpcd:1.1
--- /dev/null Tue Apr 7 11:49:19 2009
+++ src/distrib/common/Makefile.dhcpcd Tue Apr 7 11:49:17 2009
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile.dhcpcd,v 1.1 2009/04/07 11:49:17 joerg Exp $
+
+IMAGEDEPENDS+= \
+ ${DESTDIR}/etc/dhcpcd.conf \
+ ${DESTDIR}/libexec/dhcpcd-run-hooks \
+ ${DESTDIR}/libexec/dhcpcd-hooks/30-hostname
+
+LISTS+= ${DISTRIBDIR}/common/list.dhcpcd
Index: src/distrib/common/list.dhcpcd
diff -u /dev/null src/distrib/common/list.dhcpcd:1.1
--- /dev/null Tue Apr 7 11:49:19 2009
+++ src/distrib/common/list.dhcpcd Tue Apr 7 11:49:17 2009
@@ -0,0 +1,14 @@
+# $NetBSD: list.dhcpcd,v 1.1 2009/04/07 11:49:17 joerg Exp $
+#
+# list file (c.f. parselist.awk) for DHCP-enabled install media.
+#
+
+SRCDIRS external/bsd/dhcpcd/sbin
+PROG sbin/dhcpcd
+
+COPY ${DESTDIR}/etc/dhcpcd.conf etc/dhcpcd.conf
+COPY ${DESTDIR}/libexec/dhcpcd-run-hooks libexec/dhcpcd-run-hooks 555
+
+COPY ${NETBSDSRCDIR}/distrib/common/10-resolv.conf libexec/dhcpcd-hooks/10-resolv.conf
+COPY ${DESTDIR}/libexec/dhcpcd-hooks/30-hostname libexec/dhcpcd-hooks/30-hostname
+COPY ${NETBSDSRCDIR}/distrib/common/99-print-sysinst libexec/dhcpcd-hooks/99-print-sysinst
