d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bogon in the Novice mode CD auto-selection.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1996-07-13 05:13:25 +00:00
parent f6d3326b0c
commit 5cec7fa56a
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/sysinstall/install.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * 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 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -379,9 +379,11 @@ installNovice(dialogMenuItem *self)
if (!mediaDevice->init(mediaDevice)) if (!mediaDevice->init(mediaDevice))
mediaDevice = NULL; mediaDevice = NULL;
} }
msgConfirm("Finally, you must specify an installation medium."); if (!mediaDevice) {
if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice) msgConfirm("Finally, you must specify an installation medium.");
return DITEM_FAILURE | DITEM_RECREATE; if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
return DITEM_FAILURE | DITEM_RECREATE;
}
} }
if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) { if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) {

10
usr.sbin/sade/install.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * 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 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -379,9 +379,11 @@ installNovice(dialogMenuItem *self)
if (!mediaDevice->init(mediaDevice)) if (!mediaDevice->init(mediaDevice))
mediaDevice = NULL; mediaDevice = NULL;
} }
msgConfirm("Finally, you must specify an installation medium."); if (!mediaDevice) {
if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice) msgConfirm("Finally, you must specify an installation medium.");
return DITEM_FAILURE | DITEM_RECREATE; if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
return DITEM_FAILURE | DITEM_RECREATE;
}
} }
if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) { if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) {

10
usr.sbin/sysinstall/install.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * 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 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -379,9 +379,11 @@ installNovice(dialogMenuItem *self)
if (!mediaDevice->init(mediaDevice)) if (!mediaDevice->init(mediaDevice))
mediaDevice = NULL; mediaDevice = NULL;
} }
msgConfirm("Finally, you must specify an installation medium."); if (!mediaDevice) {
if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice) msgConfirm("Finally, you must specify an installation medium.");
return DITEM_FAILURE | DITEM_RECREATE; if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
return DITEM_FAILURE | DITEM_RECREATE;
}
} }
if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) { if (DITEM_STATUS((i = installCommit(self))) == DITEM_FAILURE) {