Always do fixups, even if some minor dist failed to install.

Noticed by:	luigi
This commit is contained in:
Jordan K. Hubbard 1998-09-29 05:12:39 +00:00
parent d15f150dfb
commit 919b0d127e
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=39748
3 changed files with 12 additions and 15 deletions

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: install.c,v 1.209 1998/07/18 09:42:00 jkh Exp $
* $Id: install.c,v 1.210 1998/08/31 17:47:52 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -709,10 +709,9 @@ installCommit(dialogMenuItem *self)
need_bin = Dists & DIST_BIN;
i = distExtractAll(self);
if (DITEM_STATUS(i) == DITEM_SUCCESS) {
if (need_bin && !(Dists & DIST_BIN))
i = installFixup(self);
}
/* Only do fixup if bin dist was successfully extracted */
if (need_bin && !(Dists & DIST_BIN))
i |= installFixup(self);
/* When running as init, *now* it's safe to grab the rc.foo vars */
installEnvironment();

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: install.c,v 1.209 1998/07/18 09:42:00 jkh Exp $
* $Id: install.c,v 1.210 1998/08/31 17:47:52 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -709,10 +709,9 @@ installCommit(dialogMenuItem *self)
need_bin = Dists & DIST_BIN;
i = distExtractAll(self);
if (DITEM_STATUS(i) == DITEM_SUCCESS) {
if (need_bin && !(Dists & DIST_BIN))
i = installFixup(self);
}
/* Only do fixup if bin dist was successfully extracted */
if (need_bin && !(Dists & DIST_BIN))
i |= installFixup(self);
/* When running as init, *now* it's safe to grab the rc.foo vars */
installEnvironment();

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: install.c,v 1.209 1998/07/18 09:42:00 jkh Exp $
* $Id: install.c,v 1.210 1998/08/31 17:47:52 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -709,10 +709,9 @@ installCommit(dialogMenuItem *self)
need_bin = Dists & DIST_BIN;
i = distExtractAll(self);
if (DITEM_STATUS(i) == DITEM_SUCCESS) {
if (need_bin && !(Dists & DIST_BIN))
i = installFixup(self);
}
/* Only do fixup if bin dist was successfully extracted */
if (need_bin && !(Dists & DIST_BIN))
i |= installFixup(self);
/* When running as init, *now* it's safe to grab the rc.foo vars */
installEnvironment();