Bug 137415

Summary:	Wrong letter capitalization of kernel name option in install.cfg
Product:	Documentation	Reporter:	Yuri Gorchakov <yuri.gorchakov>
Component:	Books & Articles	Assignee:	John Baldwin <jhb>
Status:	Closed FIXED
Severity:	Affects Only Me
Priority:	Normal
Version:	Latest
Hardware:	Any
OS:	Any

Description Yuri Gorchakov 2009-08-04 09:30:02 UTC

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.

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.
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.

Comment 1 John Baldwin freebsd_committer

2009-08-04 12:56:45 UTC

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

Comment 2 dfilter service freebsd_committer

2009-08-12 15:38:08 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"

Comment 3 John Baldwin freebsd_committer

2009-08-13 13:25:22 UTC

State Changed
From-To: open->patched

Fixed in 8, will MFC to 6/7 in a few days.

Comment 4 John Baldwin freebsd_committer

2009-08-13 13:25:22 UTC

Responsible Changed
From-To: freebsd-doc->jhb

Fixed in 8, will MFC to 6/7 in a few days.

Comment 5 John Baldwin freebsd_committer

2009-08-17 18:34:39 UTC

State Changed
From-To: patched->closed

Fix merged to 7.x.