From owner-svn-src-head@FreeBSD.ORG Wed Apr 8 20:10:45 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5FA263B; Wed, 8 Apr 2015 20:10:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B69DA1FF; Wed, 8 Apr 2015 20:10:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t38KAjkm011646; Wed, 8 Apr 2015 20:10:45 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t38KAhTQ011637; Wed, 8 Apr 2015 20:10:43 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201504082010.t38KAhTQ011637@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Wed, 8 Apr 2015 20:10:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281275 - head/sys/boot/forth X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2015 20:10:45 -0000 Author: dteske Date: Wed Apr 8 20:10:42 2015 New Revision: 281275 URL: https://svnweb.freebsd.org/changeset/base/281275 Log: Re-do proper mode-endings. Antithesis of r281176-281179 which reverted 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@hardenedbsdorg) MFC after: 3 days X-MFC-to: stable/10 X-MFC-with: r280925,280974-280976,281176-281179 Modified: head/sys/boot/forth/loader.4th head/sys/boot/forth/logo-beastie.4th head/sys/boot/forth/logo-orb.4th head/sys/boot/forth/menu.4th head/sys/boot/forth/menu.rc head/sys/boot/forth/version.4th Modified: head/sys/boot/forth/loader.4th ============================================================================== --- head/sys/boot/forth/loader.4th Wed Apr 8 19:50:17 2015 (r281274) +++ head/sys/boot/forth/loader.4th Wed Apr 8 20:10:42 2015 (r281275) @@ -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 ; Modified: head/sys/boot/forth/logo-beastie.4th ============================================================================== --- head/sys/boot/forth/logo-beastie.4th Wed Apr 8 19:50:17 2015 (r281274) +++ head/sys/boot/forth/logo-beastie.4th Wed Apr 8 20:10:42 2015 (r281275) @@ -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 ; Modified: head/sys/boot/forth/logo-orb.4th ============================================================================== --- head/sys/boot/forth/logo-orb.4th Wed Apr 8 19:50:17 2015 (r281274) +++ head/sys/boot/forth/logo-orb.4th Wed Apr 8 20:10:42 2015 (r281275) @@ -49,7 +49,7 @@ s" -- @[31;1m-.@[31m" logo+ s" `:` @[31;1m`:`" logo+ s" @[31;1m.-- `--." logo+ - s" .---.....----.@[37m" logo+ + s" .---.....----.@[m" logo+ 2drop ; Modified: head/sys/boot/forth/menu.4th ============================================================================== --- head/sys/boot/forth/menu.4th Wed Apr 8 19:50:17 2015 (r281274) +++ head/sys/boot/forth/menu.4th Wed Apr 8 20:10:42 2015 (r281275) @@ -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 Modified: head/sys/boot/forth/menu.rc ============================================================================== --- head/sys/boot/forth/menu.rc Wed Apr 8 19:50:17 2015 (r281274) +++ head/sys/boot/forth/menu.rc Wed Apr 8 20:10:42 2015 (r281275) @@ -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 Suppo 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) Modified: head/sys/boot/forth/version.4th ============================================================================== --- head/sys/boot/forth/version.4th Wed Apr 8 19:50:17 2015 (r281274) +++ head/sys/boot/forth/version.4th Wed Apr 8 20:10:42 2015 (r281275) @@ -88,7 +88,7 @@ only forth definitions also version-proc 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 ;