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/media.c | |
parent | a0a2505c0f9a23874949583d907fd726bf68ffa8 (diff) | |
download | FreeBSD-src-fb9a08eec21dc6fd5697d2cb9eabeb95a937dab0.zip FreeBSD-src-fb9a08eec21dc6fd5697d2cb9eabeb95a937dab0.tar.gz |
YAMF22
Diffstat (limited to 'release/sysinstall/media.c')
-rw-r--r-- | release/sysinstall/media.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index 5906ca8..3b0f231 100644 --- a/release/sysinstall/media.c +++ b/release/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$ + * $Id: media.c,v 1.80 1997/02/22 14:11:57 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -675,21 +675,15 @@ mediaExtractDist(char *dir, char *dist, FILE *fp) int mediaGetType(dialogMenuItem *self) { - int i; - - i = dmenuOpenSimple(&MenuMedia, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE; - return i | DITEM_RESTORE; + return ((dmenuOpenSimple(&MenuMedia, FALSE) && mediaDevice) ? DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE; } /* Return TRUE if all the media variables are set up correctly */ Boolean mediaVerify(void) { - if (!mediaDevice) { - msgConfirm("Media type not set! Please select a media type\n" - "from the Installation menu before proceeding."); - return DITEM_STATUS(mediaGetType(NULL)) == DITEM_SUCCESS; - } + if (!mediaDevice) + return (DITEM_STATUS(mediaGetType(NULL)) == DITEM_SUCCESS); return TRUE; } |