diff options
| -rw-r--r-- | release/sysinstall/ftp_strat.c | 7 | ||||
| -rw-r--r-- | release/sysinstall/install.c | 11 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 11 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 11 |
4 files changed, 22 insertions, 18 deletions
diff --git a/release/sysinstall/ftp_strat.c b/release/sysinstall/ftp_strat.c index 212593f..9f24ebc 100644 --- a/release/sysinstall/ftp_strat.c +++ b/release/sysinstall/ftp_strat.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: ftp_strat.c,v 1.27 1996/10/02 08:25:05 jkh Exp $ + * $Id: ftp_strat.c,v 1.28 1996/10/02 10:44:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -102,9 +102,10 @@ try: FtpPassive(ftp, !strcmp(variable_get(VAR_FTP_STATE), "passive")); FtpBinary(ftp, 1); if (dir && *dir != '\0') { - msgDebug("Attempt to chdir to distribution in %s\n", dir); - if (FtpChdir(ftp, dir) == IO_ERROR) + if (FtpChdir(ftp, dir) == IO_ERROR) { + msgDebug("Attempt to chdir to distribution in %s returns I/O error\n", dir); goto punt; + } } /* Give it a shot - can't hurt to try and zoom in if we can, unless the release is set to diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 5779181..4ee031c 100644 --- a/release/sysinstall/install.c +++ b/release/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.131 1996/10/06 14:45:57 jkh Exp $ + * $Id: install.c,v 1.132 1996/10/09 09:53:32 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -548,6 +548,7 @@ installCommit(dialogMenuItem *self) { int i; char *str; + Boolean need_bin = FALSE; if (!mediaVerify()) return DITEM_FAILURE; @@ -564,11 +565,11 @@ installCommit(dialogMenuItem *self) return i; } + if (Dists & DIST_BIN) + need_bin = TRUE; i = distExtractAll(self); - if (DITEM_STATUS(i) != DITEM_FAILURE) - i = installFixup(self); - else if (!(Dists & DIST_BIN)) - (void)installFixup(self); + if (DITEM_STATUS(i) != DITEM_FAILURE || !need_bin || !(Dists & DIST_BIN)) + i = installFixup(self); variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install"); return i | DITEM_RECREATE; diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 5779181..4ee031c 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.131 1996/10/06 14:45:57 jkh Exp $ + * $Id: install.c,v 1.132 1996/10/09 09:53:32 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -548,6 +548,7 @@ installCommit(dialogMenuItem *self) { int i; char *str; + Boolean need_bin = FALSE; if (!mediaVerify()) return DITEM_FAILURE; @@ -564,11 +565,11 @@ installCommit(dialogMenuItem *self) return i; } + if (Dists & DIST_BIN) + need_bin = TRUE; i = distExtractAll(self); - if (DITEM_STATUS(i) != DITEM_FAILURE) - i = installFixup(self); - else if (!(Dists & DIST_BIN)) - (void)installFixup(self); + if (DITEM_STATUS(i) != DITEM_FAILURE || !need_bin || !(Dists & DIST_BIN)) + i = installFixup(self); variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install"); return i | DITEM_RECREATE; diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 5779181..4ee031c 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.131 1996/10/06 14:45:57 jkh Exp $ + * $Id: install.c,v 1.132 1996/10/09 09:53:32 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -548,6 +548,7 @@ installCommit(dialogMenuItem *self) { int i; char *str; + Boolean need_bin = FALSE; if (!mediaVerify()) return DITEM_FAILURE; @@ -564,11 +565,11 @@ installCommit(dialogMenuItem *self) return i; } + if (Dists & DIST_BIN) + need_bin = TRUE; i = distExtractAll(self); - if (DITEM_STATUS(i) != DITEM_FAILURE) - i = installFixup(self); - else if (!(Dists & DIST_BIN)) - (void)installFixup(self); + if (DITEM_STATUS(i) != DITEM_FAILURE || !need_bin || !(Dists & DIST_BIN)) + i = installFixup(self); variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install"); return i | DITEM_RECREATE; |
