diff options
| author | jkh <jkh@FreeBSD.org> | 1996-07-13 05:13:25 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-07-13 05:13:25 +0000 |
| commit | fc7c1d4c712bb14220ec5c57431d056f82eaabc3 (patch) | |
| tree | d1c0e7454b6a6866c659a5b6ee17e24a7ac4c817 /usr.sbin | |
| parent | 394f0328da8c5cb4d1e5a5f9cdee314d75537822 (diff) | |
| download | FreeBSD-src-fc7c1d4c712bb14220ec5c57431d056f82eaabc3.zip FreeBSD-src-fc7c1d4c712bb14220ec5c57431d056f82eaabc3.tar.gz | |
Fix a bogon in the Novice mode CD auto-selection.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/install.c | 10 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index d17ca01..5f3a7ec 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/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: install.c,v 1.112 1996/07/09 14:28:16 jkh Exp $ + * $Id: install.c,v 1.113 1996/07/12 11:14:06 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -379,9 +379,11 @@ installNovice(dialogMenuItem *self) if (!mediaDevice->init(mediaDevice)) mediaDevice = NULL; } - msgConfirm("Finally, you must specify an installation medium."); - if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice) - return DITEM_FAILURE | DITEM_RECREATE; + if (!mediaDevice) { + msgConfirm("Finally, you must specify an installation medium."); + if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice) + return DITEM_FAILURE | DITEM_RECREATE; + } } if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) { diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index d17ca01..5f3a7ec 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/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: install.c,v 1.112 1996/07/09 14:28:16 jkh Exp $ + * $Id: install.c,v 1.113 1996/07/12 11:14:06 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -379,9 +379,11 @@ installNovice(dialogMenuItem *self) if (!mediaDevice->init(mediaDevice)) mediaDevice = NULL; } - msgConfirm("Finally, you must specify an installation medium."); - if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice) - return DITEM_FAILURE | DITEM_RECREATE; + if (!mediaDevice) { + msgConfirm("Finally, you must specify an installation medium."); + if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice) + return DITEM_FAILURE | DITEM_RECREATE; + } } if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) { |
