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

[svn at pcbsd.org]

Author: kris
Date: 2008-08-19 18:12:21 -0700 (Tue, 19 Aug 2008)
New Revision: 2617

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

Update the beastie.4th installer script to allow the user to select vesa
on / off instead of just booting right away



Modified: pcbsd/trunk/installcd-overlay/boot/beastie.4th
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-08-20 00:15:04 UTC (rev 2616)
+++ pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-08-20 01:12:21 UTC (rev 2617)
@@ -43,11 +43,12 @@
 variable bootsafekey
 variable bootverbosekey
 variable bootemergencykey
-variable bootvesakey
 variable bootzfskey
 variable bootsinglekey
 variable escapekey
 variable rebootkey
+variable xvesa
+variable xvesa_set
 
 46 constant dot
 
@@ -216,7 +217,7 @@
 	printmenuitem ."  Boot PC-BSD in single user mode" bootsinglekey !
 	printmenuitem ."  Boot PC-BSD with verbose logging" bootverbosekey !
 	printmenuitem ."  Boot PC-BSD to emergency console" bootemergencykey !
-	printmenuitem ."  Run installer in VESA mode" bootvesakey !
+	printmenuitem ."  Run installer in VESA mode" xvesa !
         printmenuitem ."  Boot PC-BSD with ZFS support" bootzfskey !
 	printmenuitem ."  Escape to loader prompt" escapekey !
 	menuX @ 20 at-xy
@@ -257,6 +258,8 @@
 	else
 		drop
 	then
+	s" NO" s" xvesa" setenv
+	0 xvesa_set !
 	beastie-menu
 	s" autoboot_delay" getenv
 	dup -1 = if
@@ -306,9 +309,18 @@
 			s" /boot/kernel;/boot/modules;/CONSOLE/" s" module_path" setenv
 			0 boot
 		then
-		dup bootvesakey @ = if
-			s" /boot/kernel;/boot/modules;/VESA/" s" module_path" setenv
-			0 boot
+		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 bootsinglekey @ = if
 			s" YES" s" boot_single" setenv