summaryrefslogtreecommitdiffstats
path: root/release/sysinstall
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1997-01-04 12:36:39 +0000
committerjkh <jkh@FreeBSD.org>1997-01-04 12:36:39 +0000
commitfaf2f698798b8fa7bd77b85fa31f3304a9580f30 (patch)
treec3e56a165364babb3177a12f77b217533db1579f /release/sysinstall
parent174d10d4f6ac49e836f73b023c0d9d544e6ab5bc (diff)
downloadFreeBSD-src-faf2f698798b8fa7bd77b85fa31f3304a9580f30.zip
FreeBSD-src-faf2f698798b8fa7bd77b85fa31f3304a9580f30.tar.gz
Add a few strategic screen clears in network setup.
Disable saving of SCSI device parameters in userconfig saving in hopes of working around a reported problem in the no-device case; there's no point in saving this information here anyway. 2nd patch submitted-by: "Eric L. Hernes" <erich@lodgenet.com>
Diffstat (limited to 'release/sysinstall')
-rw-r--r--release/sysinstall/network.c4
-rw-r--r--release/sysinstall/uc_main.c8
2 files changed, 9 insertions, 3 deletions
diff --git a/release/sysinstall/network.c b/release/sysinstall/network.c
index c5a07b7..7348be5 100644
--- a/release/sysinstall/network.c
+++ b/release/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.24 1996/12/12 08:23:50 jkh Exp $
+ * $Id: network.c,v 1.25 1997/01/01 12:36:08 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -203,6 +203,7 @@ startPPP(Device *devp)
val = variable_get(VAR_GATEWAY);
SAFE_STRCPY(provider, (val && *val) ? val : "0");
+ dialog_clear_norefresh();
val = msgGetInput(provider, "Enter the IP address of your service provider or 0 if you\n"
"don't know it and would prefer to negotiate it dynamically.");
SAFE_STRCPY(provider, (val && *val) ? val : "0");
@@ -283,6 +284,7 @@ startPPP(Device *devp)
exit(1);
}
else {
+ dialog_clear_norefresh();
msgConfirm("NOTICE: The PPP command is now started on VTY3 (type ALT-F3 to\n"
"interact with it, ALT-F1 to switch back here). The only command\n"
"you'll probably want or need to use is the \"term\" command\n"
diff --git a/release/sysinstall/uc_main.c b/release/sysinstall/uc_main.c
index 987f597..df4d645 100644
--- a/release/sysinstall/uc_main.c
+++ b/release/sysinstall/uc_main.c
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* library functions for userconfig library
*
- * $Id: uc_main.c,v 1.13 1996/10/12 20:23:17 erich Exp $
+ * $Id: uc_main.c,v 1.14 1996/12/09 08:22:18 jkh Exp $
*/
#include <sys/types.h>
@@ -209,10 +209,14 @@ uc_open(char *name){
get_eisa_info(kern);
if (isDebug())
msgDebug("uc_open: got eisa information\n");
-
+#ifdef USE_SCSI
get_scsi_info(kern);
if (isDebug())
msgDebug("uc_open: got scsi information\n");
+#else
+ kern->scsi_devp=(struct uc_scsi*)NULL;
+ kern->scsibus_devp=(struct uc_scsibus*)NULL;
+#endif
return kern;
}
OpenPOWER on IntegriCloud