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 /usr.sbin/sysinstall/installUpgrade.c | |
parent | a0a2505c0f9a23874949583d907fd726bf68ffa8 (diff) | |
download | FreeBSD-src-fb9a08eec21dc6fd5697d2cb9eabeb95a937dab0.zip FreeBSD-src-fb9a08eec21dc6fd5697d2cb9eabeb95a937dab0.tar.gz |
YAMF22
Diffstat (limited to 'usr.sbin/sysinstall/installUpgrade.c')
-rw-r--r-- | usr.sbin/sysinstall/installUpgrade.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c index c7cc42c..76711d0 100644 --- a/usr.sbin/sysinstall/installUpgrade.c +++ b/usr.sbin/sysinstall/installUpgrade.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: installUpgrade.c,v 1.44 1997/02/07 04:26:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -242,17 +242,16 @@ installUpgrade(dialogMenuItem *self) systemCreateHoloshell(); } - if (!mediaVerify()) { - msgConfirm("Now you must specify an installation medium for the upgrade."); media: - if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice) - return DITEM_FAILURE | DITEM_RESTORE; - } + if (!mediaVerify()) + return DITEM_FAILURE | DITEM_RESTORE; if (!mediaDevice->init(mediaDevice)) { if (!msgYesNo("Couldn't initialize the media. Would you like\n" - "to adjust your media selection and try again?")) + "to adjust your media selection and try again?")) { + mediaDevice = NULL; goto media; + } else return DITEM_FAILURE | DITEM_REDRAW; } |