[PC-BSD Commits] r6488 - pcbsd/trunk/system-overlay/boot

[svn at pcbsd.org]

Author: kris
Date: 2010-04-01 11:15:11 -0700 (Thu, 01 Apr 2010)
New Revision: 6488

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

Nice update to beastie.4th, now you can toggle a variety of options to mix-n-match before
booting, like acpi, safe mode, vesa mode, and run the display setup wizard. 



Modified: pcbsd/trunk/system-overlay/boot/beastie.4th
===================================================================
--- pcbsd/trunk/system-overlay/boot/beastie.4th	2010-04-01 18:13:52 UTC (rev 6487)
+++ pcbsd/trunk/system-overlay/boot/beastie.4th	2010-04-01 18:15:11 UTC (rev 6488)
@@ -46,8 +46,10 @@
 variable bootsinglekey
 variable escapekey
 variable rebootkey
+variable bootsafe_set
 variable xvesa
 variable xvesa_set
+variable xwiz_set
 
 46 constant dot
 
@@ -180,22 +182,37 @@
 	43 22 2 2 box
 	13 6 at-xy ." Welcome to PC-BSD!"
 	printmenuitem ."  Boot PC-BSD [default]" bootkey !
+	printmenuitem ."  Boot PC-BSD in single user mode" bootsinglekey !
+	printmenuitem ."  Boot PC-BSD with verbose logging" bootverbosekey !
 	s" arch-i386" environment? if
 		drop
-		printmenuitem ."  Boot PC-BSD with ACPI " bootacpikey !
+		printmenuitem ."  Toggle ACPI " bootacpikey !
 		acpienabled? if
-			." disabled"
+			." (Enabled)"
 		else
-			." enabled"
+			." (Disabled)"
 		then
 	else
 		-2 bootacpikey !
 	then
-	printmenuitem ."  Boot PC-BSD in Safe Mode" bootsafekey !
-	printmenuitem ."  Boot PC-BSD in single user mode" bootsinglekey !
-	printmenuitem ."  Boot PC-BSD with verbose logging" bootverbosekey !
-	printmenuitem ."  Run X in VESA mode" xvesa !
-	printmenuitem ."  Run the Display Setup Wizard" rundisplaywiz !
+	printmenuitem ."  Toggle Safe Mode " bootsafekey !
+	bootsafe_set @ 1 = if
+		." (Enabled)"
+	else
+		." (Disabled)"
+	then
+	printmenuitem ."  Toggle X in VESA mode " xvesa !
+	xvesa_set @ 1 = if
+		." (Enabled)"
+	else
+		." (Disabled)"
+	then
+	printmenuitem ."  Run the Display Wizard " rundisplaywiz !
+	xwiz_set @ 1 = if
+		." (Enabled)"
+	else
+		." (Disabled)"
+	then
 	printmenuitem ."  Escape to loader prompt" escapekey !
 	printmenuitem ."  Reboot" rebootkey !
 	menuX @ 20 at-xy
@@ -237,7 +254,9 @@
 		drop
 	then
 	s" NO" s" xvesa" setenv
+	0 bootsafe_set !
 	0 xvesa_set !
+	0 xwiz_set !
 	beastie-menu
 	s" autoboot_delay" getenv
 	dup -1 = if
@@ -247,6 +266,7 @@
 		0 0 2swap >number drop drop drop
 	then
 	begin
+		beastie-menu
 		dup tkey
 		0 25 at-xy
 		dup 32 = if nip 0 swap then
@@ -262,22 +282,23 @@
 				s" YES" s" acpi_load" setenv
 				s" 0" s" hint.acpi.0.disabled" setenv
 			then
-			0 boot
 		then
 		dup bootsafekey @ = if
-			s" arch-i386" environment? if
-				drop
-				s" acpi_load" unsetenv
-				s" 1" s" hint.acpi.0.disabled" setenv
-				s" 1" s" loader.acpi_disabled_by_user" setenv
-				s" 1" s" hint.apic.0.disabled" setenv
+			bootsafe_set @ 1 = if
+				s" 0" s" hw.ata.ata_dma" setenv
+				s" 0" s" hw.ata.atapi_dma" setenv
+				s" 0" s" hw.ata.wc" setenv
+				s" 0" s" hw.eisa_slots" setenv
+				s" 1" s" hint.kbdmux.0.disabled" setenv
+				0 bootsafe_set !
+			else
+				s" 1" s" hw.ata.ata_dma" setenv
+				s" 1" s" hw.ata.atapi_dma" setenv
+				s" 1" s" hw.ata.wc" setenv
+				s" 1" s" hw.eisa_slots" setenv
+				s" 0" s" hint.kbdmux.0.disabled" setenv
+				1 bootsafe_set !
 			then
-			s" 0" s" hw.ata.ata_dma" setenv
-			s" 0" s" hw.ata.atapi_dma" setenv
-			s" 0" s" hw.ata.wc" setenv
-			s" 0" s" hw.eisa_slots" setenv
-			s" 1" s" hint.kbdmux.0.disabled" setenv
-			0 boot
 		then
 		dup bootverbosekey @ = if
 			s" YES" s" boot_verbose" setenv
@@ -285,20 +306,21 @@
 		then
 		dup xvesa @ = if
 			xvesa_set @ 1 = if
-				menuX @ 23 at-xy
-				." xvesa unset" 
 				s" NO" s" xvesa" setenv
 				0 xvesa_set !
 			else
-				menuX @ 23 at-xy
-				." xvesa set  " 
 				s" YES" s" xvesa" setenv
 				1 xvesa_set !
 			then
 		then
 		dup rundisplaywiz @ = if
-			s" YES" s" runwiz" setenv
-			0 boot
+			xwiz_set @ 1 = if
+				s" NO" s" runwiz" setenv
+				0 xwiz_set !
+			else
+				s" YES" s" runwiz" setenv
+				1 xwiz_set !
+			then
 		then
 		dup bootsinglekey @ = if
 			s" YES" s" boot_single" setenv