Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 6 Dec 2010 20:55:14 +0000 (UTC)
From:      Bruce Cran <brucec@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r216243 - head/usr.sbin/sysinstall
Message-ID:  <201012062055.oB6KtEc3044625@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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();

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012062055.oB6KtEc3044625>