diff options
| author | jkh <jkh@FreeBSD.org> | 1997-03-07 16:39:32 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-03-07 16:39:32 +0000 |
| commit | fb9a08eec21dc6fd5697d2cb9eabeb95a937dab0 (patch) | |
| tree | 89abffcae73d1908aa7990fa4f26df689bae3ccb /release/sysinstall/install.c | |
| parent | a0a2505c0f9a23874949583d907fd726bf68ffa8 (diff) | |
| download | FreeBSD-src-fb9a08eec21dc6fd5697d2cb9eabeb95a937dab0.zip FreeBSD-src-fb9a08eec21dc6fd5697d2cb9eabeb95a937dab0.tar.gz | |
YAMF22
Diffstat (limited to 'release/sysinstall/install.c')
| -rw-r--r-- | release/sysinstall/install.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index a6614eb..116b0c9 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: install.c,v 1.172 1997/02/22 14:11:46 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -636,10 +636,8 @@ installCommit(dialogMenuItem *self) return DITEM_FAILURE | DITEM_RESTORE; } - if (!mediaDevice) { - if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice) - return DITEM_FAILURE | DITEM_RESTORE; - } + if (!mediaVerify()) + return DITEM_FAILURE | DITEM_RESTORE; str = variable_get(SYSTEM_STATE); if (isDebug()) @@ -657,7 +655,8 @@ try_media: if (!mediaDevice->init(mediaDevice)) { if (!msgYesNo("Unable to initialize selected media. Would you like to\n" "adjust your media configuration and try again?")) { - if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice) + mediaDevice = NULL; + if (!mediaVerify()) return DITEM_FAILURE | DITEM_RESTORE; else goto try_media; |
