Author: brucec Date: Thu Dec 9 15:24:59 2010 New Revision: 216325 URL: http://svn.freebsd.org/changeset/base/216325
Log: MFC r216243: 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. Approved by: re (kensmith) Modified: stable/8/usr.sbin/sysinstall/dist.c stable/8/usr.sbin/sysinstall/install.c Directory Properties: stable/8/usr.sbin/sysinstall/ (props changed) Modified: stable/8/usr.sbin/sysinstall/dist.c ============================================================================== --- stable/8/usr.sbin/sysinstall/dist.c Thu Dec 9 12:30:13 2010 (r216324) +++ stable/8/usr.sbin/sysinstall/dist.c Thu Dec 9 15:24:59 2010 (r216325) @@ -765,6 +765,9 @@ distExtract(char *parent, Distribution * canceled = 1; status = FALSE; + } else { + // ignore any failures with DIST_LOCAL + status = TRUE; } } break; @@ -921,7 +924,7 @@ distExtractAll(dialogMenuItem *self) restorescr(w); if (extract_status == FALSE) - status = DITEM_FAILURE; + status = FALSE; return status; } Modified: stable/8/usr.sbin/sysinstall/install.c ============================================================================== --- stable/8/usr.sbin/sysinstall/install.c Thu Dec 9 12:30:13 2010 (r216324) +++ stable/8/usr.sbin/sysinstall/install.c Thu Dec 9 15:24:59 2010 (r216325) @@ -853,7 +853,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(); _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"