diff options
author | brucec <brucec@FreeBSD.org> | 2010-12-06 20:55:14 +0000 |
---|---|---|
committer | brucec <brucec@FreeBSD.org> | 2010-12-06 20:55:14 +0000 |
commit | f84e526334bd13cc3772b0d7dbb15aa5b4da51e3 (patch) | |
tree | f562f51ba233522bf385cc90f33795710f291f07 | |
parent | bd1f37ab1768b85d2f93d751b7151a2f4103c154 (diff) | |
download | FreeBSD-src-f84e526334bd13cc3772b0d7dbb15aa5b4da51e3.zip FreeBSD-src-f84e526334bd13cc3772b0d7dbb15aa5b4da51e3.tar.gz |
Ignore any failures with the "local" distribution since it's not present
on release CDs and so will normally fail.
installCommit() returns a DITEM_ value, not a Boolean.
distExtractAll() returns a Boolean, not a DITEM_ value.
Reported by: kensmith
MFC after: 3 days
-rw-r--r-- | usr.sbin/sysinstall/dist.c | 5 | ||||
-rw-r--r-- | usr.sbin/sysinstall/install.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 716a054..8ef8544 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -757,6 +757,9 @@ distExtract(char *parent, Distribution *me) canceled = 1; status = FALSE; + } else { + // ignore any failures with DIST_LOCAL + status = TRUE; } } break; @@ -913,7 +916,7 @@ distExtractAll(dialogMenuItem *self) restorescr(w); if (extract_status == FALSE) - status = DITEM_FAILURE; + status = FALSE; return status; } diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index db347e2..daacaa6 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -855,7 +855,7 @@ try_media: i = distExtractAll(self); if (i == FALSE) - return FALSE; + return DITEM_FAILURE; /* When running as init, *now* it's safe to grab the rc.foo vars */ installEnvironment(); |