diff options
| author | jkh <jkh@FreeBSD.org> | 1996-10-12 23:48:33 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-10-12 23:48:33 +0000 |
| commit | 3287a8d4c6e9ac3f4317b0544054ca2a8a248c0d (patch) | |
| tree | c65876e45ee2c4e3b9578cb76e439624771086ce /release/sysinstall/install.c | |
| parent | 9e1f278658af7e178ea432e182793d78905b493e (diff) | |
| download | FreeBSD-src-3287a8d4c6e9ac3f4317b0544054ca2a8a248c0d.zip FreeBSD-src-3287a8d4c6e9ac3f4317b0544054ca2a8a248c0d.tar.gz | |
Be less draconian about distribution extraction errors - still write
/etc file changes out.
Diffstat (limited to 'release/sysinstall/install.c')
| -rw-r--r-- | release/sysinstall/install.c | 11 |
1 files changed, 6 insertions, 5 deletions
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; |
