From owner-svn-src-stable@FreeBSD.ORG  Tue Apr  2 14:10:23 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 520E8BD1;
 Tue,  2 Apr 2013 14:10:23 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 44BB66B1;
 Tue,  2 Apr 2013 14:10:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r32EANoj016766;
 Tue, 2 Apr 2013 14:10:23 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r32EANZf016765;
 Tue, 2 Apr 2013 14:10:23 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201304021410.r32EANZf016765@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Tue, 2 Apr 2013 14:10:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r249023 - stable/8/usr.sbin/sysinstall
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Apr 2013 14:10:23 -0000

Author: dteske
Date: Tue Apr  2 14:10:22 2013
New Revision: 249023
URL: http://svnweb.freebsd.org/changeset/base/249023

Log:
  Oops, r240972 (Add DEBUG kernel distribution) forgot to make said distribution
  optional (such as the long-standing "local" distribution; also optional). This
  fixes a regression in the install process when the user selects "All" as the
  distribution-set.
  
  This is a direct commit to stable/8.
  
  PR:		bin/177309
  Reviewed by:	eadler

Modified:
  stable/8/usr.sbin/sysinstall/dist.c

Modified: stable/8/usr.sbin/sysinstall/dist.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/dist.c	Tue Apr  2 13:52:09 2013	(r249022)
+++ stable/8/usr.sbin/sysinstall/dist.c	Tue Apr  2 14:10:22 2013	(r249023)
@@ -756,7 +756,9 @@ distExtract(char *parent, Distribution *
 		&me[i] == BASE_DIST);
 	    if (!status) {
 		dialog_clear_norefresh();
-		if (me[i].my_bit != DIST_LOCAL) {
+		if (me[i].my_bit != DIST_LOCAL &&
+		    me[i].my_bit != DIST_KERNEL_DEBUG)
+		{
 		    status = msgYesNo("Unable to transfer the %s distribution from\n%s.\n\n"
 			              "Do you want to try to retrieve it again?",
 				      me[i].my_name, mediaDevice->name);
@@ -767,7 +769,7 @@ distExtract(char *parent, Distribution *
 
 		    status = FALSE;
 		} else {
-			// ignore any failures with DIST_LOCAL
+			// ignore any failures with DIST_LOCAL/_KERNEL_DEBUG
 			status = TRUE;
 		}
 	    }
@@ -906,8 +908,8 @@ distExtractAll(dialogMenuItem *self)
     if ((old_dists & DIST_KERNEL) && !(Dists & DIST_KERNEL))
 	status |= installFixupKernel(self, old_kernel);
 
-    /* Clear any local dist flags now */
-    Dists &= ~DIST_LOCAL;
+    /* Clear any optional dist flags now */
+    Dists &= ~(DIST_LOCAL|DIST_KERNEL_DEBUG);
 
     if (Dists) {
 	int col = 0;