[PC-BSD Commits] r2029 - pcbsd/trunk/installcd-overlay/boot

[svn at pcbsd.org]

Author: kris
Date: 2008-06-06 05:32:26 -0700 (Fri, 06 Jun 2008)
New Revision: 2029

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

Setup loader.conf and beastie.4th to only load zfs module if request at 
menu



Modified: pcbsd/trunk/installcd-overlay/boot/beastie.4th
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-06-06 12:23:33 UTC (rev 2028)
+++ pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-06-06 12:32:26 UTC (rev 2029)
@@ -315,6 +315,7 @@
 			0 boot
 		then
                 dup bootzfskey @ = if
+			s" YES" s" zfs_load" setenv
                         s" 512M" s" vm.kmem_size" setenv
                         s" 512M" s" vm.kmem_size_max" setenv
                         s" /boot/kernel;/boot/modules;/ZFS/" s" module_path" setenv

Modified: pcbsd/trunk/installcd-overlay/boot/loader.conf
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/loader.conf	2008-06-06 12:23:33 UTC (rev 2028)
+++ pcbsd/trunk/installcd-overlay/boot/loader.conf	2008-06-06 12:32:26 UTC (rev 2029)
@@ -3,6 +3,6 @@
 mfsroot_name="/boot/mfsroot"
 loader_logo="pcbsd"
 autoboot_delay="5"                      # Set timeout for loader splash
-zfs_load="YES"				# Load ZFS 
+#zfs_load="YES"				# Load ZFS 
 scd_load="YES"
 #geom_journal_load="YES"                 # Load gjournal