diff options
author | jkh <jkh@FreeBSD.org> | 1999-05-06 11:03:21 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1999-05-06 11:03:21 +0000 |
commit | d6a2e062bc5598054488b210d5c0f3de33e90277 (patch) | |
tree | 2eb12511e4ad6102b9cd518ddd313bc464a988c4 /release | |
parent | 5b08c51b31821f3ee69a4da34d5618c450494568 (diff) | |
download | FreeBSD-src-d6a2e062bc5598054488b210d5c0f3de33e90277.zip FreeBSD-src-d6a2e062bc5598054488b210d5c0f3de33e90277.tar.gz |
Fix includes; I had a slightly different Makefile than everyone else
which is why I didn't see this. :)
Noted by: Maxim Sobolev <sobomax@altavista.net>
Diffstat (limited to 'release')
-rw-r--r-- | release/sysinstall/help/network_device.hlp | 9 | ||||
-rw-r--r-- | release/sysinstall/kget.c | 6 | ||||
-rw-r--r-- | release/sysinstall/tcpip.c | 17 |
3 files changed, 24 insertions, 8 deletions
diff --git a/release/sysinstall/help/network_device.hlp b/release/sysinstall/help/network_device.hlp index 3519c0f..ae725e1 100644 --- a/release/sysinstall/help/network_device.hlp +++ b/release/sysinstall/help/network_device.hlp @@ -43,14 +43,15 @@ using one of the supported PCMCIA Ethernet cards, also be sure that it's plugged in _before_ the laptop is powered on! FreeBSD does not, unfortunately, currently support "hot insertion" of PCMCIA cards. -You will also need to know your IP address on the network, the -"netmask" value for your address class, and the name of your machine. -Your system administrator can tell you which values to use for your +If you don't have the option of DHCP configuration, you will also need +to know your IP address on the network and the "netmask" value for +your address class in addition to the name of your machine. Your +system administrator can tell you which values to use for your particular network setup. If you will be referring to other hosts by name rather than IP address, you'll also need a name server and possibly the address of a gateway (if you're using PPP, it's your provider's IP address) to use in talking to it. If you do not know the answers to all or most of these questions then you should really -probably talk to your system administrator _first_ before trying this +probably talk to your system administrator FIRST before trying this type of installation! Choosing the wrong IP address on a busy network will NOT make you popular with your systems administrator! :-) diff --git a/release/sysinstall/kget.c b/release/sysinstall/kget.c index 284683a..c972255 100644 --- a/release/sysinstall/kget.c +++ b/release/sysinstall/kget.c @@ -23,13 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kget.c,v 1.5 1999/05/05 10:14:06 jkh Exp $ + * $Id: kget.c,v 1.6 1999/05/05 11:34:03 jkh Exp $ */ #include "sysinstall.h" #include <sys/sysctl.h> -#include <isa/isa_device.h> -#include <isa/pnp.h> +#include <i386/isa/isa_device.h> +#include <i386/isa/pnp.h> int kget(char *out) diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c index b30d52e..27a60d1 100644 --- a/release/sysinstall/tcpip.c +++ b/release/sysinstall/tcpip.c @@ -1,5 +1,5 @@ /* - * $Id: tcpip.c,v 1.74 1998/11/15 09:06:20 jkh Exp $ + * $Id: tcpip.c,v 1.75 1999/02/05 22:15:52 jkh Exp $ * * Copyright (c) 1995 * Gary J Palmer. All rights reserved. @@ -167,18 +167,33 @@ tcpOpenDialog(Device *devp) else { /* See if there are any defaults */ char *cp; + /* First try a DHCP scan */ + msgNotify("Scanning for DHCP servers..."); + Mkdir("/var/db"); + vsystem("ifconfig %s inet 0.0.0.0 netmask 0.0.0.0 broadcast 255.255.255.255 up", devp->name); + if (!vsystem("dhclient")) { + msgConfirm("Successful return from dhclient"); + } + else + msgConfirm("Unsuccessful return from dhclient"); + + /* Get old IP address from variable space, if available */ if (!ipaddr[0]) { if ((cp = variable_get(VAR_IPADDR)) != NULL) SAFE_STRCPY(ipaddr, cp); else if ((cp = variable_get(string_concat3(devp->name, "_", VAR_IPADDR))) != NULL) SAFE_STRCPY(ipaddr, cp); } + + /* Get old netmask from variable space, if available */ if (!netmask[0]) { if ((cp = variable_get(VAR_NETMASK)) != NULL) SAFE_STRCPY(netmask, cp); else if ((cp = variable_get(string_concat3(devp->name, "_", VAR_NETMASK))) != NULL) SAFE_STRCPY(netmask, cp); } + + /* Get old extras string from variable space, if available */ if (!extras[0]) { if ((cp = variable_get(VAR_EXTRAS)) != NULL) SAFE_STRCPY(extras, cp); |