diff options
| author | jkh <jkh@FreeBSD.org> | 1998-09-29 05:12:39 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-09-29 05:12:39 +0000 |
| commit | 0837b38281e6c7f72babc120b1cbd1d064c3a7d9 (patch) | |
| tree | 5c19bf465ad49e34eda26f5ba14fbf0d845c3f5c | |
| parent | 2b29fdee5944ea2eca80cd1a0e73cf4ee93c57d1 (diff) | |
| download | FreeBSD-src-0837b38281e6c7f72babc120b1cbd1d064c3a7d9.zip FreeBSD-src-0837b38281e6c7f72babc120b1cbd1d064c3a7d9.tar.gz | |
Always do fixups, even if some minor dist failed to install.
Noticed by: luigi
| -rw-r--r-- | release/sysinstall/install.c | 9 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 9 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 4585699..294df02 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.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 @@ try_media: 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(); diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 4585699..294df02 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.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 @@ try_media: 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(); diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 4585699..294df02 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.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 @@ try_media: 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(); |
