summaryrefslogtreecommitdiffstats
path: root/release/sysinstall/install.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1997-01-15 16:21:10 +0000
committerjkh <jkh@FreeBSD.org>1997-01-15 16:21:10 +0000
commit0a608020ca8ac7086e4c8bda6632c6de3371557d (patch)
tree5cd14f8429c545bf05b57d3db39aae1b37ae9270 /release/sysinstall/install.c
parent685ecfc4277d59baa4edf2ef39c962e3bdcab039 (diff)
downloadFreeBSD-src-0a608020ca8ac7086e4c8bda6632c6de3371557d.zip
FreeBSD-src-0a608020ca8ac7086e4c8bda6632c6de3371557d.tar.gz
Keep our serial ports distinct so that first device is not found for
all (closes PR#2296). Print better FTP failure diagnostics Do better media failure checking in install.
Diffstat (limited to 'release/sysinstall/install.c')
-rw-r--r--release/sysinstall/install.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index af9d364..bf7e84a 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -674,10 +674,14 @@ installCommit(dialogMenuItem *self)
return DITEM_FAILURE | DITEM_RESTORE;
}
- if (!mediaDevice && !msgYesNo("You need to select a media type first. Do you want\n"
- "to do this now?")) {
- if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
- return DITEM_FAILURE | DITEM_RESTORE;
+ if (!mediaDevice) {
+ if (!msgYesNo("You need to select a media type first. Do you want\n"
+ "to do this now?")) {
+ if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
+ return DITEM_FAILURE | DITEM_RECREATE;
+ }
+ else
+ return DITEM_FAILURE | DITEM_RESTORE;
}
if (!mediaDevice->init(mediaDevice)) {
OpenPOWER on IntegriCloud