diff options
| -rw-r--r-- | release/sysinstall/dist.c | 6 | ||||
| -rw-r--r-- | release/sysinstall/media.c | 7 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/media.c | 7 |
4 files changed, 10 insertions, 16 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index 3ec4f9d..6112686 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -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; diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index d173da8..8686637 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: 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()) { diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 3ec4f9d..6112686 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -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; diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c index d173da8..8686637 100644 --- a/usr.sbin/sysinstall/media.c +++ b/usr.sbin/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: 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()) { |
