hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-14 22:32:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-do proper mode-endings. Antithesis of r281176-281179 which reverted

Browse Source 
earlier migration away from sloppy mode-endings (r280925,280974-280976)
due to a red-herring in diagnosing HardenedBSD boot lockup.

Thanks to:	lattera (shawn.webb@hardenedbsd<dot>org)
MFC after:	3 days
X-MFC-to:	stable/10
X-MFC-with:	r280925,280974-280976,281176-281179
This commit is contained in:
Devin Teske 2015-04-08 20:10:42 +00:00
parent a7496c776d
commit a7ec487755
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=281275
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/boot/forth/loader.4th
View File

@ -53,7 +53,7 @@ only forth definitions
loader_color? dup ( -- bool bool )
if 7 fg 4 bg then
." Booting..."
if escc ." 0m" then
if me then
cr
;

12
sys/boot/forth/logo-beastie.4th
View File

@ -40,11 +40,11 @@
s" @[31m, ," logo+
s" /( )`" logo+
s" \ \___ / |" logo+
s" /- @[37m_@[31m `-/ '" logo+
s" (@[37m/\/ \@[31m \ /\" logo+
s" @[37m/ / |@[31m ` \" logo+
s" @[34mO O @[37m) @[31m/ |" logo+
s" @[37m`-^--'@[31m`< '" logo+
s" /- @[m_@[31m `-/ '" logo+
s" (@[m/\/ \@[31m \ /\" logo+
s" @[m/ / |@[31m ` \" logo+
s" @[34mO O @[m) @[31m/ |" logo+
s" @[m`-^--'@[31m`< '" logo+
s" (_.) _ ) /" logo+
s" `.___/` /" logo+
s" `-----' /" logo+
@ -55,7 +55,7 @@
s" \ / /\" logo+
s" @[36m______@[31m( (_ / \______/" logo+
s" @[36m,' ,-----' |" logo+
s" `--{__________)@[37m" logo+
s" `--{__________)@[m" logo+
2drop
;

2
sys/boot/forth/logo-orb.4th
View File

@ -49,7 +49,7 @@
s" -- @[31;1m-.@[31m" logo+
s" `:` @[31;1m`:`" logo+
s" @[31;1m.-- `--." logo+
s" .---.....----.@[37m" logo+
s" .---.....----.@[m" logo+
2drop
;

2
sys/boot/forth/menu.4th
View File

@ -221,7 +221,7 @@ also menu-infrastructure definitions
loader_color? dup ( -- bool bool )
if b then
menuidx @ .
if 7 fg then
if me then
\ Move the cursor forward 1 column
dup menuX @ 1+ swap at-xy

32
sys/boot/forth/menu.rc
View File

@ -29,22 +29,22 @@ set mainmenu_init[1]="init_boot"
set mainmenu_caption[1]="Boot Multi User [Enter]"
set maintoggled_text[1]="Boot [S]ingle User [Enter]"
set mainmenu_command[1]="boot"
set mainansi_caption[1]="^[1mB^[37moot Multi User ^[1m[Enter]^[37m"
set maintoggled_ansi[1]="Boot ^[1mS^[37mingle User ^[1m[Enter]^[37m"
set mainansi_caption[1]="^[1mB^[moot Multi User ^[1m[Enter]^[m"
set maintoggled_ansi[1]="Boot ^[1mS^[mingle User ^[1m[Enter]^[m"
\ keycode set by init_boot
set mainmenu_init[2]="init_altboot"
set mainmenu_caption[2]="Boot [S]ingle User"
set maintoggled_text[2]="Boot [M]ulti User"
set mainmenu_command[2]="altboot"
set mainansi_caption[2]="Boot ^[1mS^[37mingle User"
set maintoggled_ansi[2]="Boot ^[1mM^[37multi User"
set mainansi_caption[2]="Boot ^[1mS^[mingle User"
set maintoggled_ansi[2]="Boot ^[1mM^[multi User"
\ keycode set by init_altboot
set mainmenu_caption[3]="[Esc]ape to loader prompt"
set mainmenu_command[3]="goto_prompt"
set mainmenu_keycode[3]=27
set mainansi_caption[3]="^[1mEsc^[37mape to loader prompt"
set mainansi_caption[3]="^[1mEsc^[mape to loader prompt"
\ Enable built-in "Reboot" trailing menuitem
\ NOTE: appears before menu_options if configured
@ -63,7 +63,7 @@ set mainmenu_keycode[5]=107
set mainmenu_caption[6]="Configure Boot [O]ptions..."
set mainmenu_command[6]="2 goto_menu"
set mainmenu_keycode[6]=111
set mainansi_caption[6]="Configure Boot ^[1mO^[37mptions..."
set mainansi_caption[6]="Configure Boot ^[1mO^[mptions..."
\
\ BOOT OPTIONS MENU
@ -74,12 +74,12 @@ set menuset_name2="options"
set optionsmenu_caption[1]="Back to Main Menu [Backspace]"
set optionsmenu_command[1]="1 goto_menu"
set optionsmenu_keycode[1]=8
set optionsansi_caption[1]="Back to Main Menu ^[1m[Backspace]^[37m"
set optionsansi_caption[1]="Back to Main Menu ^[1m[Backspace]^[m"
set optionsmenu_caption[2]="Load System [D]efaults"
set optionsmenu_command[2]="set_default_boot_options"
set optionsmenu_keycode[2]=100
set optionsansi_caption[2]="Load System ^[1mD^[37mefaults"
set optionsansi_caption[2]="Load System ^[1mD^[mefaults"
set optionsmenu_options=3
set optionsmenu_optionstext="Boot Options:"
@ -89,32 +89,32 @@ set optionsmenu_caption[3]="[A]CPI Support off"
set optionstoggled_text[3]="[A]CPI Support On"
set optionsmenu_command[3]="toggle_acpi"
set optionsmenu_keycode[3]=97
set optionsansi_caption[3]="^[1mA^[37mCPI Support ^[34;1mOff^[37m"
set optionstoggled_ansi[3]="^[1mA^[37mCPI Support ^[32;7mOn^[0;37m"
set optionsansi_caption[3]="^[1mA^[mCPI Support ^[34;1mOff^[m"
set optionstoggled_ansi[3]="^[1mA^[mCPI Support ^[32;7mOn^[m"
set optionsmenu_init[4]="init_safemode"
set optionsmenu_caption[4]="Safe [M]ode... off"
set optionstoggled_text[4]="Safe [M]ode... On"
set optionsmenu_command[4]="toggle_safemode"
set optionsmenu_keycode[4]=109
set optionsansi_caption[4]="Safe ^[1mM^[37mode... ^[34;1mOff^[37m"
set optionstoggled_ansi[4]="Safe ^[1mM^[37mode... ^[32;7mOn^[0;37m"
set optionsansi_caption[4]="Safe ^[1mM^[mode... ^[34;1mOff^[m"
set optionstoggled_ansi[4]="Safe ^[1mM^[mode... ^[32;7mOn^[m"
set optionsmenu_init[5]="init_singleuser"
set optionsmenu_caption[5]="[S]ingle User. off"
set optionstoggled_text[5]="[S]ingle User. On"
set optionsmenu_command[5]="toggle_singleuser"
set optionsmenu_keycode[5]=115
set optionsansi_caption[5]="^[1mS^[37mingle User. ^[34;1mOff^[37m"
set optionstoggled_ansi[5]="^[1mS^[37mingle User. ^[32;7mOn^[0;37m"
set optionsansi_caption[5]="^[1mS^[mingle User. ^[34;1mOff^[m"
set optionstoggled_ansi[5]="^[1mS^[mingle User. ^[32;7mOn^[m"
set optionsmenu_init[6]="init_verbose"
set optionsmenu_caption[6]="[V]erbose..... off"
set optionstoggled_text[6]="[V]erbose..... On"
set optionsmenu_command[6]="toggle_verbose"
set optionsmenu_keycode[6]=118
set optionsansi_caption[6]="^[1mV^[37merbose..... ^[34;1mOff^[37m"
set optionstoggled_ansi[6]="^[1mV^[37merbose..... ^[32;7mOn^[0;37m"
set optionsansi_caption[6]="^[1mV^[merbose..... ^[34;1mOff^[m"
set optionstoggled_ansi[6]="^[1mV^[merbose..... ^[32;7mOn^[m"
\ Enable automatic booting (add ``autoboot_delay=N'' to loader.conf(5) to
\ customize the timeout; default is 10-seconds)

2
sys/boot/forth/version.4th
View File

@ -88,7 +88,7 @@ only forth definitions also version-processing
loader_color? dup ( c-addr/u -- c-addr/u bool bool )
if 6 fg then
-rot type
if 7 fg then
if me then
0 25 at-xy
;