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

Fix a bogus decent into the network setup screen when running

Browse Source 
multi-user.

Don't clear media on dist failure - this was one of those "seemed like a good
idea at the time" sorts of features.
This commit is contained in:
jkh 1996-11-02 19:50:32 +00:00
parent e177b0ed6e
commit 1ba8fe776a
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/sysinstall/dist.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.72 1996/10/06 14:45:54 jkh Exp $
* $Id: dist.c,v 1.73 1996/10/10 09:22:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -580,10 +580,6 @@ distExtractAll(dialogMenuItem *self)
msgConfirm("Couldn't extract the following distributions. This may\n"
"be because they were not available on the installation\n"
"media you've chosen:\n\n\t%s", buf);
/* Assume that if we couldn't get all the dists, our media probably needs changing at this point */
if (mediaDevice->type == DEVICE_TYPE_FTP)
variable_unset(VAR_FTP_PATH);
mediaDevice->shutdown(mediaDevice);
return DITEM_FAILURE | DITEM_RESTORE;
}
return DITEM_SUCCESS;

7
release/sysinstall/media.c
View File

@ -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: media.c,v 1.61 1996/10/12 19:30:20 jkh Exp $
* $Id: media.c,v 1.62 1996/10/14 21:50:38 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -300,8 +300,9 @@ mediaSetFTP(dialogMenuItem *self)
strcpy(ftpDevice.name, cp);
dialog_clear_norefresh();
if (network_init || msgYesNo("You've already done the network configuration once,\n"
"would you like to skip over it now?") != 0) {
if (RunningAsInit &&
(network_init || msgYesNo("You've already done the network configuration once,\n"
"would you like to skip over it now?") != 0)) {
if (mediaDevice)
mediaDevice->shutdown(mediaDevice);
if (!tcpDeviceSelect()) {

6
usr.sbin/sysinstall/dist.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.72 1996/10/06 14:45:54 jkh Exp $
* $Id: dist.c,v 1.73 1996/10/10 09:22:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -580,10 +580,6 @@ distExtractAll(dialogMenuItem *self)
msgConfirm("Couldn't extract the following distributions. This may\n"
"be because they were not available on the installation\n"
"media you've chosen:\n\n\t%s", buf);
/* Assume that if we couldn't get all the dists, our media probably needs changing at this point */
if (mediaDevice->type == DEVICE_TYPE_FTP)
variable_unset(VAR_FTP_PATH);
mediaDevice->shutdown(mediaDevice);
return DITEM_FAILURE | DITEM_RESTORE;
}
return DITEM_SUCCESS;

7
usr.sbin/sysinstall/media.c
View File

@ -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: media.c,v 1.61 1996/10/12 19:30:20 jkh Exp $
* $Id: media.c,v 1.62 1996/10/14 21:50:38 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -300,8 +300,9 @@ mediaSetFTP(dialogMenuItem *self)
strcpy(ftpDevice.name, cp);
dialog_clear_norefresh();
if (network_init || msgYesNo("You've already done the network configuration once,\n"
"would you like to skip over it now?") != 0) {
if (RunningAsInit &&
(network_init || msgYesNo("You've already done the network configuration once,\n"
"would you like to skip over it now?") != 0)) {
if (mediaDevice)
mediaDevice->shutdown(mediaDevice);
if (!tcpDeviceSelect()) {