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

[svn at pcbsd.org]

Author: kris
Date: 2008-08-19 18:22:37 -0700 (Tue, 19 Aug 2008)
New Revision: 2619

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

Changed beastie.4th even more to allow the user to set ZFS on / off on the fly



Modified: pcbsd/trunk/installcd-overlay/boot/beastie.4th
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-08-20 01:12:39 UTC (rev 2618)
+++ pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-08-20 01:22:37 UTC (rev 2619)
@@ -43,12 +43,13 @@
 variable bootsafekey
 variable bootverbosekey
 variable bootemergencykey
-variable bootzfskey
 variable bootsinglekey
 variable escapekey
 variable rebootkey
 variable xvesa
 variable xvesa_set
+variable bootzfs
+variable bootzfs_set
 
 46 constant dot
 
@@ -218,7 +219,7 @@
 	printmenuitem ."  Boot PC-BSD with verbose logging" bootverbosekey !
 	printmenuitem ."  Boot PC-BSD to emergency console" bootemergencykey !
 	printmenuitem ."  Run installer in VESA mode" xvesa !
-        printmenuitem ."  Boot PC-BSD with ZFS support" bootzfskey !
+        printmenuitem ."  Enable installer ZFS support" bootzfs !
 	printmenuitem ."  Escape to loader prompt" escapekey !
 	menuX @ 20 at-xy
 	." Select option, [Enter] for default"
@@ -260,6 +261,8 @@
 	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
@@ -322,17 +325,29 @@
 				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 bootsinglekey @ = if
 			s" YES" s" boot_single" setenv
 			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
-                        0 boot
-                then
 		dup escapekey @ = if
 			2drop
 			s" NO" s" autoboot_delay" setenv