summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/media.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-11-02 19:50:32 +0000
committerjkh <jkh@FreeBSD.org>1996-11-02 19:50:32 +0000
commit1ba8fe776a6c19eab7fa8198f92299bbfe51e120 (patch)
treebd29112a57cf129659bfe29a3f625251d017583c /usr.sbin/sysinstall/media.c
parente177b0ed6e3c354416cc9e64f2b93c0e38786d7e (diff)
downloadFreeBSD-src-1ba8fe776a6c19eab7fa8198f92299bbfe51e120.zip
FreeBSD-src-1ba8fe776a6c19eab7fa8198f92299bbfe51e120.tar.gz
Fix a bogus decent into the network setup screen when running
multi-user. Don't clear media on dist failure - this was one of those "seemed like a good idea at the time" sorts of features.
Diffstat (limited to 'usr.sbin/sysinstall/media.c')
-rw-r--r--usr.sbin/sysinstall/media.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index d173da8..8686637 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.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: media.c,v 1.61 1996/10/12 19:30:20 jkh Exp $
+ * $Id: media.c,v 1.62 1996/10/14 21:50:38 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -300,8 +300,9 @@ mediaSetFTP(dialogMenuItem *self)
strcpy(ftpDevice.name, cp);
dialog_clear_norefresh();
- if (network_init || msgYesNo("You've already done the network configuration once,\n"
- "would you like to skip over it now?") != 0) {
+ if (RunningAsInit &&
+ (network_init || msgYesNo("You've already done the network configuration once,\n"
+ "would you like to skip over it now?") != 0)) {
if (mediaDevice)
mediaDevice->shutdown(mediaDevice);
if (!tcpDeviceSelect()) {
OpenPOWER on IntegriCloud