From 7930d3c38198d8ab3bbc9bd0ead13eb00b6afcdb Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 24 Jan 2016 17:59:58 +0100 Subject: [PATCH] sys/boot: branding by the one and only @kurbel --- sys/boot/amd64/boot1.efi/boot1.c | 2 +- sys/boot/arm/ixp425/boot2/boot2.c | 2 +- sys/boot/forth/brand-fbsd.4th | 18 +++++++++--------- sys/boot/forth/logo-orb.4th | 26 +++++++++++++------------- sys/boot/forth/logo-orbbw.4th | 2 +- sys/boot/forth/menu.4th | 2 +- sys/boot/i386/boot0/boot0.S | 6 +++--- sys/boot/i386/boot0/boot0ext.S | 2 +- sys/boot/i386/boot2/boot2.c | 2 +- sys/boot/i386/zfsboot/zfsboot.c | 2 +- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/sys/boot/amd64/boot1.efi/boot1.c b/sys/boot/amd64/boot1.efi/boot1.c index cb75d2a12f4..c5a8df0772c 100644 --- a/sys/boot/amd64/boot1.efi/boot1.c +++ b/sys/boot/amd64/boot1.efi/boot1.c @@ -125,7 +125,7 @@ EFI_STATUS efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE* Xsystab) (void)ConsoleControl->SetMode(ConsoleControl, EfiConsoleControlScreenText); - printf(" \n>> FreeBSD EFI boot block\n"); + printf(" \n>> OPNsense EFI boot block\n"); printf(" Loader path: %s\n", path); status = systab->BootServices->LocateHandle(ByProtocol, diff --git a/sys/boot/arm/ixp425/boot2/boot2.c b/sys/boot/arm/ixp425/boot2/boot2.c index e5f49827394..def64a5aca4 100644 --- a/sys/boot/arm/ixp425/boot2/boot2.c +++ b/sys/boot/arm/ixp425/boot2/boot2.c @@ -163,7 +163,7 @@ main(void) p_memset((char *)dmadat, 0, 32 * 1024); bt = board_init(); - printf("FreeBSD ARM (%s) boot2 v%d.%d\n", bt, 0, 4); + printf("OPNsense ARM (%s) boot2 v%d.%d\n", bt, 0, 4); autoboot = 1; diff --git a/sys/boot/forth/brand-fbsd.4th b/sys/boot/forth/brand-fbsd.4th index 9cd017f84a3..8d942b30680 100644 --- a/sys/boot/forth/brand-fbsd.4th +++ b/sys/boot/forth/brand-fbsd.4th @@ -1,4 +1,5 @@ \ Copyright (c) 2006-2015 Devin Teske +\ Copyright (c) 2016 Tobias Boertitz \ All rights reserved. \ \ Redistribution and use in source and binary forms, with or without @@ -24,7 +25,7 @@ \ \ $FreeBSD$ -2 brandX ! 1 brandY ! \ Initialize brand placement defaults +17 brandX ! 1 brandY ! \ Initialize brand placement defaults : brand+ ( x y c-addr/u -- x y' ) 2swap 2dup at-xy 2swap \ position the cursor @@ -32,15 +33,14 @@ 1+ \ increase y for next time we're called ; -: brand ( x y -- ) \ "FreeBSD" [wide] logo in B/W (7 rows x 42 columns) +: brand ( x y -- ) \ "OPNsense" [wide] logo in B/W (6 rows x 47 columns) - s" ______ ____ _____ _____ " brand+ - s" | ____| | _ \ / ____| __ \ " brand+ - s" | |___ _ __ ___ ___ | |_) | (___ | | | |" brand+ - s" | ___| '__/ _ \/ _ \| _ < \___ \| | | |" brand+ - s" | | | | | __/ __/| |_) |____) | |__| |" brand+ - s" | | | | | | || | | |" brand+ - s" |_| |_| \___|\___||____/|_____/|_____/ " brand+ + s" ______ _____ _____ " brand+ + s" / __ |/ ___ |/ __ | " brand+ + s" | | | | |__/ | | | |___ ___ _ __ ___ ___ " brand+ + s" | | | | ___/| | | / __|/ _ \ '_ \/ __|/ _ \" brand+ + s" | |__| | | | | | \__ \ __/ | | \__ \ __/" brand+ + s" |_____/|_| |_| /__|___/\___|_| |_|___/\___|" brand+ 2drop ; diff --git a/sys/boot/forth/logo-orb.4th b/sys/boot/forth/logo-orb.4th index c2a504d1ddf..16361245acd 100644 --- a/sys/boot/forth/logo-orb.4th +++ b/sys/boot/forth/logo-orb.4th @@ -24,7 +24,7 @@ \ \ $FreeBSD$ -46 logoX ! 7 logoY ! \ Initialize logo placement defaults +48 logoX ! 8 logoY ! \ Initialize logo placement defaults : logo+ ( x y c-addr/u -- x y' ) 2swap 2dup at-xy 2swap \ position the cursor @@ -35,18 +35,18 @@ : logo ( x y -- ) \ color Orb mascot (15 rows x 30 columns) - s" @[31m``` @[31;1m`@[31m" logo+ - s" s` `.....---...@[31;1m....--.``` -/@[31m" logo+ - s" +o .--` @[31;1m/y:` +.@[31m" logo+ - s" yo`:. @[31;1m:o `+-@[31m" logo+ - s" y/ @[31;1m-/` -o/@[31m" logo+ - s" .- @[31;1m::/sy+:.@[31m" logo+ - s" / @[31;1m`-- /@[31m" logo+ - s" `: @[31;1m:`@[31m" logo+ - s" `: @[31;1m:`@[31m" logo+ - s" / @[31;1m/@[31m" logo+ - s" .- @[31;1m-.@[31m" logo+ - s" -- @[31;1m-.@[31m" logo+ + s" @[30;1m``` @[31;1m`@[30;1m" logo+ + s" s` `.....---...@[31;1m....--.``` -/@[30;1m" logo+ + s" +o .--` @[31;1m/y:` +.@[30;1m" logo+ + s" yo`:. @[31;1m:o `+-@[30;1m" logo+ + s" y/ @[31;1m-/` -o/@[30;1m" logo+ + s" .- @[31;1m::/sy+:.@[30;1m" logo+ + s" / @[31;1m`-- /@[30;1m" logo+ + s" `: @[31;1m:`@[30;1m" logo+ + s" `: @[31;1m:`@[30;1m" logo+ + s" / @[31;1m/@[30;1m" logo+ + s" .- @[31;1m-.@[30;1m" logo+ + s" -- @[31;1m-.@[30;1m" logo+ s" `:` @[31;1m`:`" logo+ s" @[31;1m.-- `--." logo+ s" .---.....----.@[m" logo+ diff --git a/sys/boot/forth/logo-orbbw.4th b/sys/boot/forth/logo-orbbw.4th index 11dc11cabb7..ecb7e669f0c 100644 --- a/sys/boot/forth/logo-orbbw.4th +++ b/sys/boot/forth/logo-orbbw.4th @@ -24,7 +24,7 @@ \ \ $FreeBSD$ -46 logoX ! 7 logoY ! \ Initialize logo placement defaults +48 logoX ! 8 logoY ! \ Initialize logo placement defaults : logo+ ( x y c-addr/u -- x y' ) 2swap 2dup at-xy 2swap \ position the cursor diff --git a/sys/boot/forth/menu.4th b/sys/boot/forth/menu.4th index 912756594e3..d6eb9d10ea3 100644 --- a/sys/boot/forth/menu.4th +++ b/sys/boot/forth/menu.4th @@ -470,7 +470,7 @@ also menu-infrastructure definitions \ 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..dffa1809dcf 100644 --- a/sys/boot/i386/boot0/boot0.S +++ b/sys/boot/i386/boot0/boot0.S @@ -646,9 +646,9 @@ os_dos: .ascii "DO"; .byte 'S'|0x80 #endif os_win: .ascii "Wi"; .byte 'n'|0x80 -os_linux: .ascii "Linu"; .byte 'x'|0x80 -os_freebsd: .ascii "Free" -os_bsd: .ascii "BS"; .byte 'D'|0x80 +os_linux: .ascii "Lin"; .byte 'x'|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/boot0/boot0ext.S b/sys/boot/i386/boot0/boot0ext.S index a63de253210..0bf3ed9e7b9 100644 --- a/sys/boot/i386/boot0/boot0ext.S +++ b/sys/boot/i386/boot0/boot0ext.S @@ -485,7 +485,7 @@ os_nt: .ascii "Windows NT/X"; .byte 'P'|0x80 os_windows: .ascii "Window"; .byte 's'|0x80 os_unix: .ascii "UNI"; .byte 'X'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 -os_freebsd: .ascii "FreeBS"; .byte 'D'|0x80 +os_freebsd: .ascii "OPNsens"; .byte 'e'|0x80 os_openbsd: .ascii "OpenBS"; .byte 'D'|0x80 os_netbsd: .ascii "NetBS"; .byte 'D'|0x80 os_bsdos: .ascii "BSD/O"; .byte 'S'|0x80 diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index cd384e56589..d73aa024eb6 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -286,7 +286,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, diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c index afb77b2e26a..e98b54edaec 100644 --- a/sys/boot/i386/zfsboot/zfsboot.c +++ b/sys/boot/i386/zfsboot/zfsboot.c @@ -566,7 +566,7 @@ main(void) for (;;) { if (!autoboot || !OPT_CHECK(RBX_QUIET)) { - printf("\nFreeBSD/x86 boot\n"); + printf("\nOPNsense/x86 boot\n"); if (zfs_rlookup(spa, zfsmount.rootobj, rootname) != 0) printf("Default: %s/<0x%llx>:%s\n" "boot: ",