diff options
| author | Rebecca Cran <brucec@FreeBSD.org> | 2010-12-09 15:27:43 +0000 |
|---|---|---|
| committer | Rebecca Cran <brucec@FreeBSD.org> | 2010-12-09 15:27:43 +0000 |
| commit | 3b333684d6fc08d53ace4f5052209058211abbe7 (patch) | |
| tree | a55fdbd3f1b0f4742a688c492dac4cd72497d8da | |
| parent | 8fbf54f174b091cc61789a2007207aad5436ff06 (diff) | |
Notes
| -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 3cfef154c8543..3abb532fc0b03 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -781,6 +781,9 @@ distExtract(char *parent, Distribution *me) canceled = 1; status = FALSE; + } else { + // ignore any failures with DIST_LOCAL + status = TRUE; } } break; @@ -878,7 +881,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 a6bd7d28a71fd..a879731b73688 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -817,7 +817,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(); |