From nobody@FreeBSD.org  Tue Aug  4 08:29:04 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86973106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  4 Aug 2009 08:29:04 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 748778FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  4 Aug 2009 08:29:04 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n748T3Ib029224
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 4 Aug 2009 08:29:03 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n748T39v029223;
	Tue, 4 Aug 2009 08:29:03 GMT
	(envelope-from nobody)
Message-Id: <200908040829.n748T39v029223@www.freebsd.org>
Date: Tue, 4 Aug 2009 08:29:03 GMT
From: Yuri Gorchakov <yuri.gorchakov@point-group.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Wrong letter capitalization of kernel name option in install.cfg 
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         137415
>Category:       docs
>Synopsis:       Wrong letter capitalization of kernel name option in install.cfg
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jhb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 04 08:30:02 UTC 2009
>Closed-Date:    Mon Aug 17 17:35:04 UTC 2009
>Last-Modified:  Mon Aug 17 17:35:04 UTC 2009
>Originator:     Yuri Gorchakov
>Release:        FreeBSD 7.1-RELEASE-p6
>Organization:
Point Group
>Environment:
FreeBSD alienware.local 7.1-RELEASE-p6 FreeBSD 7.1-RELEASE-p6 #29: Tue Jun 23 16:26:25 NOVST 2009     root@alienware.local:/usr/obj/usr/src/sys/YNEW64  amd64
>Description:
sysinstall documentation shows install.cfg option to install generic kernel as 
dists=base generic
distSetCustom
but it doesn't work that way, it must be 
dists=base GENERIC 
distSetCustom
for sysinstall to pickup and install the kernel.
>How-To-Repeat:
write an install.cfg script with such options set:
mediaSetCDROM
dists=base generic lib32
distSetCustom
disk=ad0
partition=all
bootManager=boot
diskPartitionEditor
ad0s1-1=ufs 1048576 /
ad0s1-2=swap 1048576 none
ad0s1-3=ufs 2097152 /tmp 1
ad0s1-4=ufs 8388608 /var 1
ad0s1-5=ufs 0 /usr 1
diskLabelEditor
installCommit

put the script on either floppy or custom CD and make sysinstall pick it up and run.
>Fix:
fix the documentation to show 
dists   List of distributions to load.  Possible distribution
		     values are:

		base      The base binary distribution.

		GENERIC        The GENERIC kernel.


>Release-Note:
>Audit-Trail:

From: John Baldwin <jhb@freebsd.org>
To: freebsd-doc@freebsd.org
Cc: Yuri Gorchakov <yuri.gorchakov@point-group.ru>,
 freebsd-gnats-submit@freebsd.org
Subject: Re: docs/137415: Wrong letter capitalization of kernel name option in install.cfg
Date: Tue, 4 Aug 2009 07:56:45 -0400

 This should fix it:
 
 Index: install.c
 ===================================================================
 --- install.c	(revision 196050)
 +++ install.c	(working copy)
 @@ -939,7 +939,7 @@
      if (RunningAsInit) {
  	/*
  	 * Install something as /boot/kernel.  Prefer SMP
 -	 * over generic--this should handle the case where
 +	 * over GENERIC--this should handle the case where
  	 * both SMP and GENERIC are installed (otherwise we
  	 * select the one kernel that was installed).
  	 *
 Index: sysinstall.8
 ===================================================================
 --- sysinstall.8	(revision 196050)
 +++ sysinstall.8	(working copy)
 @@ -411,9 +411,9 @@
  .Bl -tag -width indentxx
  .It Li base
  The base binary distribution.
 -.It Li generic
 +.It Li GENERIC
  The GENERIC kernel.
 -.It Li smp
 +.It Li SMP
  A kernel suitable for multiple processor systems.
  .It Li doc
  Miscellaneous documentation
 
 -- 
 John Baldwin

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/137415: commit references a PR
Date: Wed, 12 Aug 2009 14:38:08 +0000 (UTC)

 Author: jhb
 Date: Wed Aug 12 14:37:57 2009
 New Revision: 196147
 URL: http://svn.freebsd.org/changeset/base/196147
 
 Log:
   Fix references to the kernel distributions to use the correct names
   (uppercase).
   
   PR:		docs/137415
   Submitted by:	Yuri Gorchakov
   Approved by:	re (rwatson, kib)
   MFC after:	3 days
 
 Modified:
   head/usr.sbin/sysinstall/install.c
   head/usr.sbin/sysinstall/sysinstall.8
 
 Modified: head/usr.sbin/sysinstall/install.c
 ==============================================================================
 --- head/usr.sbin/sysinstall/install.c	Wed Aug 12 13:20:42 2009	(r196146)
 +++ head/usr.sbin/sysinstall/install.c	Wed Aug 12 14:37:57 2009	(r196147)
 @@ -939,7 +939,7 @@ installFixupKernel(dialogMenuItem *self,
      if (RunningAsInit) {
  	/*
  	 * Install something as /boot/kernel.  Prefer SMP
 -	 * over generic--this should handle the case where
 +	 * over GENERIC--this should handle the case where
  	 * both SMP and GENERIC are installed (otherwise we
  	 * select the one kernel that was installed).
  	 *
 
 Modified: head/usr.sbin/sysinstall/sysinstall.8
 ==============================================================================
 --- head/usr.sbin/sysinstall/sysinstall.8	Wed Aug 12 13:20:42 2009	(r196146)
 +++ head/usr.sbin/sysinstall/sysinstall.8	Wed Aug 12 14:37:57 2009	(r196147)
 @@ -411,9 +411,9 @@ Possible distribution values are:
  .Bl -tag -width indentxx
  .It Li base
  The base binary distribution.
 -.It Li generic
 +.It Li GENERIC
  The GENERIC kernel.
 -.It Li smp
 +.It Li SMP
  A kernel suitable for multiple processor systems.
  .It Li doc
  Miscellaneous documentation
 _______________________________________________
 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-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: jhb 
State-Changed-When: Thu Aug 13 12:25:22 UTC 2009 
State-Changed-Why:  
Fixed in 8, will MFC to 6/7 in a few days. 


Responsible-Changed-From-To: freebsd-doc->jhb 
Responsible-Changed-By: jhb 
Responsible-Changed-When: Thu Aug 13 12:25:22 UTC 2009 
Responsible-Changed-Why:  
Fixed in 8, will MFC to 6/7 in a few days. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137415 
State-Changed-From-To: patched->closed 
State-Changed-By: jhb 
State-Changed-When: Mon Aug 17 17:34:39 UTC 2009 
State-Changed-Why:  
Fix merged to 7.x. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137415 
>Unformatted:
