From owner-svn-src-all@FreeBSD.ORG  Mon Dec  6 20:55:14 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A5691065670;
	Mon,  6 Dec 2010 20:55:14 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 68D7D8FC28;
	Mon,  6 Dec 2010 20:55:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB6KtEtP044628;
	Mon, 6 Dec 2010 20:55:14 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB6KtEc3044625;
	Mon, 6 Dec 2010 20:55:14 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201012062055.oB6KtEc3044625@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Mon, 6 Dec 2010 20:55:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216243 - head/usr.sbin/sysinstall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Dec 2010 20:55:14 -0000

Author: brucec
Date: Mon Dec  6 20:55:14 2010
New Revision: 216243
URL: http://svn.freebsd.org/changeset/base/216243

Log:
  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

Modified:
  head/usr.sbin/sysinstall/dist.c
  head/usr.sbin/sysinstall/install.c

Modified: head/usr.sbin/sysinstall/dist.c
==============================================================================
--- head/usr.sbin/sysinstall/dist.c	Mon Dec  6 20:54:53 2010	(r216242)
+++ head/usr.sbin/sysinstall/dist.c	Mon Dec  6 20:55:14 2010	(r216243)
@@ -757,6 +757,9 @@ distExtract(char *parent, Distribution *
 			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;
 }

Modified: head/usr.sbin/sysinstall/install.c
==============================================================================
--- head/usr.sbin/sysinstall/install.c	Mon Dec  6 20:54:53 2010	(r216242)
+++ head/usr.sbin/sysinstall/install.c	Mon Dec  6 20:55:14 2010	(r216243)
@@ -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();