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

[svn at pcbsd.org]

Author: melkor
Date: 2008-06-02 14:22:52 -0700 (Mon, 02 Jun 2008)
New Revision: 2010

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

Some beastie.4th emprovements


Modified: pcbsd/trunk/installcd-overlay/boot/beastie.4th
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-06-02 21:07:12 UTC (rev 2009)
+++ pcbsd/trunk/installcd-overlay/boot/beastie.4th	2008-06-02 21:22:52 UTC (rev 2010)
@@ -96,18 +96,34 @@
 ;
 
 : fbsdbw-logo ( x y -- )
-	2dup at-xy ."     ____  ______" 1+
-	2dup at-xy ."    / __ \/ ____/" 1+
-	2dup at-xy ."   / /_/ / /" 1+
-	2dup at-xy ."  / ____/ /___" 1+
-	2dup at-xy ." /_/    \____/" 1+
-	2dup at-xy ."     ____ _____ ____" 1+
-	2dup at-xy ."    / __ ) ___// __ \" 1+
-	2dup at-xy ."   / __  \__ \/ / / /" 1+
-	2dup at-xy ."  / /_/ /__/ / /_/ /" 1+
-	     at-xy ." /_____/____/_____/"
+        2dup at-xy ."      ______" 1+
+        2dup at-xy ."     |  ____| __ ___  ___ " 1+
+        2dup at-xy ."     | |__ | '__/ _ \/ _ \" 1+
+        2dup at-xy ."     |  __|| | |  __/  __/" 1+
+        2dup at-xy ."     | |   | | |    |    |" 1+
+        2dup at-xy ."     |_|   |_|  \___|\___|" 1+
+        2dup at-xy ."      ____   _____ _____" 1+
+        2dup at-xy ."     |  _ \ / ____|  __ \" 1+
+        2dup at-xy ."     | |_) | (___ | |  | |" 1+
+        2dup at-xy ."     |  _ < \___ \| |  | |" 1+
+        2dup at-xy ."     | |_) |____) | |__| |" 1+
+        2dup at-xy ."     |     |      |      |" 1+
+             at-xy ."     |____/|_____/|_____/"
 ;
 
+: pcbsd-logo ( x y -- )
+        2dup at-xy ."     ____  ______" 1+
+        2dup at-xy ."    / __ \/ ____/" 1+
+        2dup at-xy ."   / /_/ / /" 1+
+        2dup at-xy ."  / ____/ /___" 1+
+        2dup at-xy ." /_/    \____/" 1+
+        2dup at-xy ."     ____ _____ ____" 1+
+        2dup at-xy ."    / __ ) ___// __ \" 1+
+        2dup at-xy ."   / __  \__ \/ / / /" 1+
+        2dup at-xy ."  / /_/ /__/ / /_/ /" 1+
+             at-xy ." /_____/____/_____/"
+;
+
 : print-logo ( x y -- )
 	s" loader_logo" getenv
 	dup -1 = if
@@ -135,6 +151,11 @@
 		\ no logo
 		exit
 	then
+        2dup s" pcbsd" compare-insensitive 0= if
+                2drop
+                pcbsd-logo
+                exit
+        then
 	2drop
 	fbsdbw-logo
 ;
@@ -194,8 +215,8 @@
 	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 ."  Boot PC-BSD with ZFS support" bootzfskey !
 	printmenuitem ."  Run installer in VESA mode" bootvesakey !
+        printmenuitem ."  Boot PC-BSD with ZFS support" bootzfskey !
 	printmenuitem ."  Escape to loader prompt" escapekey !
 	printmenuitem ."  Reboot" rebootkey !
 	menuX @ 20 at-xy
@@ -296,7 +317,7 @@
                 dup bootzfskey @ = if
                         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
+                        s" /boot/kernel;/boot/modules;/ZFS/" s" module_path" setenv
                         0 boot
                 then
 		dup escapekey @ = if

Modified: pcbsd/trunk/installcd-overlay/boot/loader.conf
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/loader.conf	2008-06-02 21:07:12 UTC (rev 2009)
+++ pcbsd/trunk/installcd-overlay/boot/loader.conf	2008-06-02 21:22:52 UTC (rev 2010)
@@ -1,6 +1,7 @@
 mfsroot_load="YES"
 mfsroot_type="mfs_root"
 mfsroot_name="/boot/mfsroot"
+loader_logo="pcbsd"
 autoboot_delay="5"                      # Set timeout for loader splash
 zfs_load="YES"				# Load ZFS 
 scd_load="YES"