[PC-BSD Commits] r4810 - in pcbsd/trunk: installcd-overlay/boot system-overlay/boot

[svn at pcbsd.org]

Author: kris
Date: 2009-10-29 08:22:53 -0700 (Thu, 29 Oct 2009)
New Revision: 4810

Modified:
   pcbsd/trunk/installcd-overlay/boot/beastie.4th
   pcbsd/trunk/installcd-overlay/boot/loader.conf
   pcbsd/trunk/system-overlay/boot/loader.conf
Log:

Get us more in line with GENERIC kernel, so any kernel panics by our
extra modules can be disabled in the loader 



Modified: pcbsd/trunk/installcd-overlay/boot/beastie.4th
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/beastie.4th	2009-10-29 14:29:55 UTC (rev 4809)
+++ pcbsd/trunk/installcd-overlay/boot/beastie.4th	2009-10-29 15:22:53 UTC (rev 4810)
@@ -49,8 +49,6 @@
 variable rebootkey
 variable xvesa
 variable xvesa_set
-variable bootzfs
-variable bootzfs_set
 
 46 constant dot
 
@@ -220,7 +218,6 @@
 	printmenuitem ."  Boot with verbose logging" bootverbosekey !
 	printmenuitem ."  Boot to emergency console" bootemergencykey !
 	printmenuitem ."  Run X in VESA mode" xvesa !
-        printmenuitem ."  Enable ZFS support" bootzfs !
 	printmenuitem ."  Escape to loader prompt" escapekey !
 	menuX @ 20 at-xy
 	." Select option, [Enter] for default"
@@ -262,8 +259,6 @@
 	then
 	s" NO" s" xvesa" setenv
 	0 xvesa_set !
-	s" NO" s" bootzfs" setenv
-	0 bootzfs_set !
 	beastie-menu
 	s" autoboot_delay" getenv
 	dup -1 = if
@@ -326,25 +321,6 @@
 				1 xvesa_set !
 			then
 		then
-		dup bootzfs @ = if
-			bootzfs_set @ 1 = if
-				menuX @ 23 at-xy
-				." bootzfs unset" 
-				s" NO" s" bootzfs" setenv
-				s" NO" s" zfs_load" setenv
-				s" 300M" s" vm.kmem_size" setenv
-	                       	s" 300M" s" vm.kmem_size_max" setenv
-				0 bootzfs_set !
-			else
-				menuX @ 23 at-xy
-				." bootzfs set  " 
-				s" YES" s" bootzfs" setenv
-				s" YES" s" zfs_load" setenv
-                        	s" 512M" s" vm.kmem_size" setenv
-                        	s" 512M" s" vm.kmem_size_max" setenv
-				1 bootzfs_set !
-			then
-		then
 		dup bootlive @ = if
 			s" YES" s" boot_livedvd" setenv
 			0 boot

Modified: pcbsd/trunk/installcd-overlay/boot/loader.conf
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/loader.conf	2009-10-29 14:29:55 UTC (rev 4809)
+++ pcbsd/trunk/installcd-overlay/boot/loader.conf	2009-10-29 15:22:53 UTC (rev 4810)
@@ -6,25 +6,52 @@
 loader_logo="pcbsd"
 autoboot_delay="10"                      # Set timeout for loader splash
 
-# Load Vesa / Splash Screen
+# Kernel Options
+kern.ipc.shmseg=1024
+kern.ipc.shmmni=1024
+
+# Enable the splash screen
 vesa_load="YES"
 splash_pcx_load="YES"
 bitmap_load="YES"
 bitmap_name="/boot/loading-screen.pcx"
 
-# Kernel Options
-kern.ipc.shmseg=1024
-kern.ipc.shmmni=1024
+# Load Wireless Support
+if_ipw_load="YES"
+if_iwi_load="YES"
+if_wpi_load="YES"
+legal.intel_ipw.license_ack=1
+legal.intel_iwi.license_ack=1
+legal.intel_wpi.license_ack=1
 
-# Filesystem
-zfs_load="YES"
+# Load mmc card-reader support
+mmc_load="YES"
+mmcsd_load="YES"
+sdhci_load="YES"
 
-# Load geom_mirror
+# Load support for scd
+scd_load="YES"
+
+# Load sound-support
+sound_load="YES"
+snd_uaudio_load="YES"
+
+# Load geom support
+geom_journal_load="YES"
+geom_uzip_load="YES"
 geom_mirror_load="YES"
-
-# Load geom_eli
 geom_eli_load="YES"
 
-# Load Intel Wireless firmware licenses
-legal.intel_iwi.license_ack=1
-legal.intel_wpi.license_ack=1
+# Load File-System Support
+libiconv_load="YES"
+libmchain_load="YES"
+cd9660_iconv_load="YES"
+msdosfs_iconv_load="YES"
+ntfs_load="YES"
+ntfs_iconv_load="YES"
+udf_load="YES"
+udf_iconv_load="YES"
+zfs_load="YES"
+
+# Enable atapicam support
+atapicam_load="YES"

Modified: pcbsd/trunk/system-overlay/boot/loader.conf
===================================================================
--- pcbsd/trunk/system-overlay/boot/loader.conf	2009-10-29 14:29:55 UTC (rev 4809)
+++ pcbsd/trunk/system-overlay/boot/loader.conf	2009-10-29 15:22:53 UTC (rev 4810)
@@ -1,3 +1,9 @@
+# Kernel Options
+kern.ipc.shmseg=1024
+kern.ipc.shmmni=1024
+
+# Enable the splash screen
+vesa_load="YES"
 splash_pcx_load="YES"
 bitmap_load="YES"
 bitmap_name="/boot/loading-screen.pcx"
@@ -2,9 +8,40 @@
 
-# Kernel Options
-kern.ipc.shmseg=1024
-kern.ipc.shmmni=1024
-
+# Load Wireless Support
 if_ipw_load="YES"
 if_iwi_load="YES"
+if_wpi_load="YES"
 legal.intel_ipw.license_ack=1
 legal.intel_iwi.license_ack=1
+legal.intel_wpi.license_ack=1
+
+# Load mmc card-reader support
+mmc_load="YES"
+mmcsd_load="YES"
+sdhci_load="YES"
+
+# Load support for scd
+scd_load="YES"
+
+# Load sound-support
+sound_load="YES"
+snd_uaudio_load="YES"
+
+# Load geom support
+geom_journal_load="YES"
+geom_uzip_load="YES"
+geom_mirror_load="YES"
+geom_eli_load="YES"
+
+# Load File-System Support
+libiconv_load="YES"
+libmchain_load="YES"
+cd9660_iconv_load="YES"
+msdosfs_iconv_load="YES"
+ntfs_load="YES"
+ntfs_iconv_load="YES"
+udf_load="YES"
+udf_iconv_load="YES"
+zfs_load="YES"
+
+# Enable atapicam support
+atapicam_load="YES"