diff options
| author | jkh <jkh@FreeBSD.org> | 1998-11-15 09:06:20 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-11-15 09:06:20 +0000 |
| commit | ffd97e5342d926be2f35b764575b61c28801658c (patch) | |
| tree | f6d951a8fdaddd587487ae7d5a84ea7702875b0a /usr.sbin/sysinstall/network.c | |
| parent | c0977927244cf33b27cc7a36fa0db9652260b50f (diff) | |
| download | FreeBSD-src-ffd97e5342d926be2f35b764575b61c28801658c.zip FreeBSD-src-ffd97e5342d926be2f35b764575b61c28801658c.tar.gz | |
o Break fixups into binary fixups and XFree86 based fixups.
o Move fixups into extraction routine so all consumers don't have to duplicate
the right behavior.
o Make some things more orthogonal (just for asthetics sake)
o Add option to go back and do it again if XF86Setup fails (possibly with
a different setup - this one has always annoyed me).
Diffstat (limited to 'usr.sbin/sysinstall/network.c')
| -rw-r--r-- | usr.sbin/sysinstall/network.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/sysinstall/network.c b/usr.sbin/sysinstall/network.c index 7dde08d..a20e561 100644 --- a/usr.sbin/sysinstall/network.c +++ b/usr.sbin/sysinstall/network.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: network.c,v 1.31 1998/07/12 17:11:53 brian Exp $ + * $Id: network.c,v 1.32 1998/10/01 19:26:02 msmith Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -58,9 +58,15 @@ mediaInitNetwork(Device *dev) if (!RunningAsInit || networkInitialized) return TRUE; - msgDebug("Init routine called for network device %s.\n", dev->name); - if (!file_readable("/etc/resolv.conf")) - configResolv(); + if (isDebug()) + msgDebug("Init routine called for network device %s.\n", dev->name); + + if (!file_readable("/etc/resolv.conf")) { + if (DITEM_STATUS(configResolv(NULL)) == DITEM_FAILURE) { + msgConfirm("Can't seem to write out /etc/resolv.conf. Net cannot be used."); + return FALSE; + } + } /* Old PPP process lying around? */ if (pppPID) { |
