From 2822f8545a2ec0452da909be0cf218d2340ef6a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20B=C3=B6rtitz?= Date: Thu, 19 Feb 2015 19:25:09 +0100 Subject: [PATCH] boot: i can has fancy pants? boot: move down orb logo by 1 row sys/boot: do the rebranding more properly sys/boot: center the logo sys/boot: more rebranding sys/boot: move logo more to the right sys/boot: OUT OF MY WAY - here comes 'OPNsense' ... who needs Windows anyway?! sys/boot: let's have some colors sys/boot: give it some space --- sys/boot/forth/beastie.4th | 30 +++++++++++++++--------------- sys/boot/forth/brand.4th | 19 +++++++++++++++---- sys/boot/forth/menu-commands.4th | 2 +- sys/boot/forth/menu.4th | 2 +- sys/boot/i386/boot0/boot0.S | 6 +++--- sys/boot/i386/boot2/boot2.c | 2 +- 6 files changed, 36 insertions(+), 25 deletions(-) diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th index 2fc073d1c00..e71d8ec436c 100644 --- a/sys/boot/forth/beastie.4th +++ b/sys/boot/forth/beastie.4th @@ -34,7 +34,7 @@ variable logoX variable logoY \ Initialize logo placement to defaults -46 logoX ! +48 logoX ! 4 logoY ! : beastie-logo ( x y -- ) \ color BSD mascot (19 rows x 34 columns) @@ -125,20 +125,20 @@ variable logoY : orb-logo ( x y -- ) \ color Orb mascot (15 rows x 30 columns) - 3 + \ beastie adjustment (see `fbsdbw-logo' comments above) + 4 + \ beastie adjustment (see `fbsdbw-logo' comments above) - 2dup at-xy ." ``` `" 1+ - 2dup at-xy ." s` `.....---.......--.``` -/" 1+ - 2dup at-xy ." +o .--` /y:` +." 1+ - 2dup at-xy ." yo`:. :o `+-" 1+ - 2dup at-xy ." y/ -/` -o/" 1+ - 2dup at-xy ." .- ::/sy+:." 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 ." s` `.....---.......--.``` -/" 1+ + 2dup at-xy ." +o .--` /y:` +." 1+ + 2dup at-xy ." yo`:. :o `+-" 1+ + 2dup at-xy ." y/ -/` -o/" 1+ + 2dup at-xy ." .- ::/sy+:." 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 ." .---.....----." @@ -149,7 +149,7 @@ variable logoY : orbbw-logo ( x y -- ) \ B/W Orb mascot (15 rows x 32 columns) - 3 + \ beastie adjustment (see `fbsdbw-logo' comments above) + 4 + \ beastie adjustment (see `fbsdbw-logo' comments above) 2dup at-xy ." ``` `" 1+ 2dup at-xy ." s` `.....---.......--.``` -/" 1+ diff --git a/sys/boot/forth/brand.4th b/sys/boot/forth/brand.4th index 28d3c5c1d26..2b394513f3f 100644 --- a/sys/boot/forth/brand.4th +++ b/sys/boot/forth/brand.4th @@ -30,7 +30,7 @@ variable brandX variable brandY \ Initialize logo placement -2 brandX ! +17 brandX ! 1 brandY ! : fbsd-logo ( x y -- ) \ "FreeBSD" [wide] logo in B/W (7 rows x 42 columns) @@ -42,6 +42,16 @@ variable brandY 2dup at-xy ." | | | | | __/ __/| |_) |____) | |__| |" 1+ 2dup at-xy ." | | | | | | || | | |" 1+ at-xy ." |_| |_| \___|\___||____/|_____/|_____/ " +; + +: opnsns-logo ( x y -- ) \ "OPNsense" [wide] logo in B/W (6 rows x 47 columns) + + 2dup at-xy ." ______ _____ _____ " 1+ + 2dup at-xy ." / __ |/ ___ |/ __ | " 1+ + 2dup at-xy ." | | | | |__/ | | | |___ ___ _ __ ___ ___ " 1+ + 2dup at-xy ." | | | | ___/| | | / __|/ _ \ '_ \/ __|/ _ \" 1+ + 2dup at-xy ." | |__| | | | | | \__ \ __/ | | \__ \ __/" 1+ + at-xy ." |_____/|_| |_| /__|___/\___|_| |_|___/\___|" \ Put the cursor back at the bottom 0 25 at-xy @@ -55,6 +65,7 @@ variable brandY \ \ NAME DESCRIPTION \ fbsd FreeBSD logo +\ opnsns OPNsense logo \ \ NOTE: Setting `loader_brand' to the value of an existing function \ (such as "mycustom-brand") will cause that symbol to be executed. @@ -80,12 +91,12 @@ variable brandY then s" loader_brand" getenv dup -1 = if - brandX @ brandY @ fbsd-logo + brandX @ brandY @ opnsns-logo drop exit then - 2dup s" fbsd" compare-insensitive 0= if - brandX @ brandY @ fbsd-logo + 2dup s" opnsns" compare-insensitive 0= if + brandX @ brandY @ opnsns-logo 2drop exit then diff --git a/sys/boot/forth/menu-commands.4th b/sys/boot/forth/menu-commands.4th index 70ae9d80620..cafeddda5f2 100644 --- a/sys/boot/forth/menu-commands.4th +++ b/sys/boot/forth/menu-commands.4th @@ -249,7 +249,7 @@ variable root_state cr ." To get back to the menu, type `menu' and press ENTER" cr - ." or type `boot' and press ENTER to start FreeBSD." cr + ." or type `boot' and press ENTER to start OPNsense." cr cr FALSE \ exit the menu diff --git a/sys/boot/forth/menu.4th b/sys/boot/forth/menu.4th index 0239115b1cc..f3dd6a9c71c 100644 --- a/sys/boot/forth/menu.4th +++ b/sys/boot/forth/menu.4th @@ -620,7 +620,7 @@ create kernelsbuf 256 allot \ Print the frame caption at (x,y) s" loader_menu_title" getenv dup -1 = if - drop s" Welcome to FreeBSD" + drop s" Welcome to OPNsense " then TRUE ( use default alignment ) s" loader_menu_title_align" getenv dup -1 <> if diff --git a/sys/boot/i386/boot0/boot0.S b/sys/boot/i386/boot0/boot0.S index 798ee97e1ef..8f4ca621fbb 100644 --- a/sys/boot/i386/boot0/boot0.S +++ b/sys/boot/i386/boot0/boot0.S @@ -645,10 +645,10 @@ os_dos: #ifndef SAVE_MORE_MEMORY /* 'DOS' remapped to 'WIN' if no room */ .ascii "DO"; .byte 'S'|0x80 #endif -os_win: .ascii "Wi"; .byte 'n'|0x80 +os_win: .ascii "W"; .byte 'n'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 -os_freebsd: .ascii "Free" -os_bsd: .ascii "BS"; .byte 'D'|0x80 +os_freebsd: .ascii "OPNs" +os_bsd: .ascii "ens"; .byte 'e'|0x80 #ifndef SAVE_MORE_MEMORY os_ext: .ascii "EX"; .byte 'T'|0x80 #endif diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 6998026d618..0665b22c273 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -271,7 +271,7 @@ main(void) for (;;) { if (!autoboot || !OPT_CHECK(RBX_QUIET)) - printf("\nFreeBSD/x86 boot\n" + printf("\nOPNsense/x86 boot\n" "Default: %u:%s(%u,%c)%s\n" "boot: ", dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,