svn commit: r249027 - releng/8.4/usr.sbin/sysinstall

[Devin Teske]

Author: dteske
Date: Tue Apr  2 17:11:07 2013
New Revision: 249027
URL: http://svnweb.freebsd.org/changeset/base/249027

Log:
  MFS8 r249023:
    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
  Approved by:	re (glebius)

Modified:
  releng/8.4/usr.sbin/sysinstall/dist.c
Directory Properties:
  releng/8.4/usr.sbin/sysinstall/   (props changed)

Modified: releng/8.4/usr.sbin/sysinstall/dist.c
==============================================================================
--- releng/8.4/usr.sbin/sysinstall/dist.c	Tue Apr  2 16:50:50 2013	(r249026)
+++ releng/8.4/usr.sbin/sysinstall/dist.c	Tue Apr  2 17:11:07 2013	(r249027)
@@ -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;