aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1999-07-18 02:20:56 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1999-07-18 02:20:56 +0000
commitbb1bff6dec38e6e0a5b98d0996ad38bc24843c28 (patch)
treeb5abd9884d22af4b496d917a69527626f92bdadf
parent7ac9503b86b75ae9dc16313802f263fea74f8099 (diff)
Notes
-rw-r--r--release/Makefile4
-rw-r--r--release/boot_crunch.conf.generic4
-rw-r--r--release/sysinstall/tcpip.c5
-rw-r--r--usr.sbin/sysinstall/tcpip.c5
4 files changed, 11 insertions, 7 deletions
diff --git a/release/Makefile b/release/Makefile
index 2052f5f20ffeb..ced89f10afd4f 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.495 1999/07/06 09:15:53 hosokawa Exp $
+# $Id: Makefile,v 1.496 1999/07/06 13:07:47 hosokawa Exp $
#
# make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
#
@@ -465,6 +465,8 @@ release.8: write_mfs_in_kernel
ls console tty ttyv0 ttyv1 ttyv2 ttyv3 null zero ${CARDDEV} | \
cpio -dump ${RD}/mfsfd/dev )
( cd ${RD}/mfsfd/dev && rm -f *[swo]d*[bdefgh] )
+ ( cd ${RD}/mfsfd && mkdir -p bin sbin && ln -s stand/sh bin/sh )
+ cp /sbin/dhclient-script ${RD}/mfsfd/sbin
.if ${PCCARD} == "YES"
cp ${.CURDIR}/../etc/pccard.conf.sample ${RD}/mfsfd/etc/pccard.conf
.endif
diff --git a/release/boot_crunch.conf.generic b/release/boot_crunch.conf.generic
index 456a95bf0f5f8..33214fe5ff764 100644
--- a/release/boot_crunch.conf.generic
+++ b/release/boot_crunch.conf.generic
@@ -1,9 +1,9 @@
-# $Id: boot_crunch.conf.generic,v 1.1 1999/06/17 19:04:46 markm Exp $
+# $Id: boot_crunch.conf.generic,v 1.2 1999/07/17 19:30:01 jkh Exp $
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386
-progs sh find
+progs sh find sed
progs pwd ppp
progs sysinstall newfs minigzip cpio bad144 fsck ifconfig route slattach
progs mount_nfs
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 269ab3e853fe1..c4ba35877be51 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
/*
- * $Id: tcpip.c,v 1.79 1999/05/07 11:45:26 jkh Exp $
+ * $Id: tcpip.c,v 1.80 1999/07/16 11:13:09 jkh Exp $
*
* Copyright (c) 1995
* Gary J Palmer. All rights reserved.
@@ -172,9 +172,10 @@ tcpOpenDialog(Device *devp)
if (!variable_cmp(VAR_TRY_DHCP, "YES")) {
Mkdir("/var/db");
Mkdir("/var/run");
+ Mkdir("/tmp");
msgNotify("Scanning for DHCP servers...");
vsystem("ifconfig %s inet 0.0.0.0 netmask 0.0.0.0 broadcast 255.255.255.255 up", devp->name);
- if (!vsystem("dhclient")) {
+ if (!vsystem("dhclient %s", devp->name)) {
FILE *ifp;
char cmd[256];
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index 269ab3e853fe1..c4ba35877be51 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
/*
- * $Id: tcpip.c,v 1.79 1999/05/07 11:45:26 jkh Exp $
+ * $Id: tcpip.c,v 1.80 1999/07/16 11:13:09 jkh Exp $
*
* Copyright (c) 1995
* Gary J Palmer. All rights reserved.
@@ -172,9 +172,10 @@ tcpOpenDialog(Device *devp)
if (!variable_cmp(VAR_TRY_DHCP, "YES")) {
Mkdir("/var/db");
Mkdir("/var/run");
+ Mkdir("/tmp");
msgNotify("Scanning for DHCP servers...");
vsystem("ifconfig %s inet 0.0.0.0 netmask 0.0.0.0 broadcast 255.255.255.255 up", devp->name);
- if (!vsystem("dhclient")) {
+ if (!vsystem("dhclient %s", devp->name)) {
FILE *ifp;
char cmd[256];