[PATCH] Fix kenv(1) output in w/respect to new boot loader
variables
Devin Teske
devin.teske at fisglobal.com
Wed Dec 28 01:58:08 UTC 2011
D'Oh! Attached wrong (OLD; already applied) patch.
Please find appropriate patch attached!
> -----Original Message-----
> From: Devin Teske [mailto:devin.teske at fisglobal.com]
> Sent: Tuesday, December 27, 2011 5:24 PM
> To: 'freebsd-hackers at freebsd.org'
> Cc: Garrett Cooper; devin.teske at fisglobal.com
> Subject: [PATCH] Fix kenv(1) output in w/respect to new boot loader variables
>
> Garrett Cooper and a few others have requested that I write a patch to fix a
> regression w/respect to kenv(1) output in FreeBSD-9.0 and HEAD.
>
> The issue is with the new boot loader menu. It adds many loader variables
> including ones that contain ANSI color escapes.
>
> Obviously, these ANSI codes don't play well with serial consoles when kenv(1)
is
> executed without arguments (reports vary as to what happens, but it's never
> pretty).
>
> Attached is a patch to the Forth code that clears-out the menu-associated
> variables before invoking the kernel.
>
> The net-effect is that kenv(1) no longer reports menu-related variables.
>
> In essence, kenv(1) output should now appear the same as on RELENG_8 (which
> lacks the new boot loader and didn't use any such variables). Thus, restoring
> serial console glory.
> --
> Devin
_____________
The information contained in this message is proprietary and/or confidential. If you are not the intended recipient, please: (i) delete the message and all copies; (ii) do not disclose, distribute or use the message in any manner; and (iii) notify the sender immediately. In addition, please be aware that any message addressed to our domain is subject to archiving and review by persons other than the intended recipient. Thank you.
-------------- next part --------------
--- src/sys/boot/forth/menu.4th.8.orig Tue Dec 27 11:36:25 2011
+++ src/sys/boot/forth/menu.4th.8 Tue Dec 27 11:41:08 2011
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD: src/sys/boot/forth/menu.4th.8,v 1.2 2011/09/02 19:29:37 jh Exp $
.\"
-.Dd Aug 29, 2011
+.Dd Dec 27, 2011
.Dt MENU.4TH 8
.Os
.Sh NAME
@@ -69,9 +69,13 @@
Calls
.Ic menu-erase
and then redraws the menu.
+.It Ic menu-unset
+Unsets the environment variables associated with individual menu items,
+clearing the way for a new menu.
.It Ic menu-clear
-Unsets all possible environment variables used
-to configure the menu and then calls
+Calls
+.Ic menu-unset
+and then
.Ic menu-erase .
.El
.Pp
--- src/sys/boot/forth/menu.4th.orig Fri Dec 2 11:17:45 2011
+++ src/sys/boot/forth/menu.4th Tue Dec 27 17:09:04 2011
@@ -131,11 +131,11 @@
\ Print the value of menuidx
loader_color? if
- ." [1m"
+ ." [1m" ( [22m )
then
menuidx @ .
loader_color? if
- ." [37m"
+ ." [37m" ( [39m )
then
\ Move the cursor forward 1 column
@@ -897,22 +897,60 @@
;
\ This function unsets all the possible environment variables associated with
-\ creating the interactive menu. Call this when you want to clear the menu
-\ area in preparation for another menu.
+\ creating the interactive menu.
\
-: menu-clear ( -- )
+: menu-unset ( -- )
49 \ Iterator start (loop range 49 to 56; ASCII '1' to '8')
begin
- \ basename for caption variable
- loader_color? if
- s" ansi_caption[x]"
- else
- s" menu_caption[x]"
- then
+ \ Unset variables in-order of appearance in menu.4th(8)
+
+ s" menu_caption[x]" \ basename for caption variable
-rot 2dup 13 + c! rot \ replace 'x' with current iteration
unsetenv \ not erroneous to unset unknown var
+ s" menu_command[x]" \ command basename
+ -rot 2dup 13 + c! rot \ replace 'x'
+ unsetenv
+
+ s" menu_keycode[x]" \ keycode basename
+ -rot 2dup 13 + c! rot \ replace 'x'
+ unsetenv
+
+ s" ansi_caption[x]" \ ANSI caption basename
+ -rot 2dup 13 + c! rot \ replace 'x'
+ unsetenv
+
+ s" toggled_text[x]" \ toggle_menuitem caption basename
+ -rot 2dup 13 + c! rot \ replace 'x'
+ unsetenv
+
+ s" toggled_ansi[x]" \ toggle_menuitem ANSI caption basename
+ -rot 2dup 13 + c! rot \ replace 'x'
+ unsetenv
+
+ s" menu_caption[x][y]" \ cycle_menuitem caption
+ -rot 2dup 13 + c! rot \ replace 'x'
+ 49 -rot
+ begin
+ 16 2over rot + c! \ replace 'y'
+ 2dup unsetenv
+
+ rot 1+ dup 56 > 2swap rot
+ until
+ 2drop drop
+
+ s" ansi_caption[x][y]" \ cycle_menuitem ANSI caption
+ -rot 2dup 13 + c! rot \ replace 'x'
+ 49 -rot
+ begin
+ 16 2over rot + c! \ replace 'y'
+ 2dup unsetenv
+
+ rot 1+ dup 56 > 2swap rot
+ until
+ 2drop drop
+
s" 0 menukeyN !" \ basename for key association var
-rot 2dup 9 + c! rot \ replace 'N' with current iteration
evaluate \ assign zero (0) to key assoc. var
@@ -921,6 +959,9 @@
until
drop \ iterator
+ \ unset the timeout command
+ s" menu_timeout_command" unsetenv
+
\ clear the "Reboot" menu option flag
s" menu_reboot" unsetenv
0 menureboot !
@@ -933,6 +974,13 @@
s" menu_options" unsetenv
0 menuoptions !
+;
+
+\ This function both unsets menu variables and visually erases the menu area
+\ in-preparation for another menu.
+\
+: menu-clear ( -- )
+ menu-unset
menu-erase
;
--- src/sys/boot/forth/loader.4th.orig Sun May 29 19:03:52 2011
+++ src/sys/boot/forth/loader.4th Tue Dec 27 11:24:55 2011
@@ -41,12 +41,15 @@
include /boot/support.4th
-\ ***** boot-conf
-\
-\ Prepares to boot as specified by loaded configuration files.
-
only forth also support-functions also builtins definitions
+: try-menu-unset
+ s" menu-unset"
+ ['] evaluate catch if
+ 2drop
+ then
+;
+
: boot
0= if ( interpreted ) get_arguments then
@@ -57,23 +60,31 @@
0 1 unload drop
else
s" kernelname" getenv? if ( a kernel has been loaded )
+ try-menu-unset
1 boot exit
then
load_kernel_and_modules
?dup if exit then
+ try-menu-unset
0 1 boot exit
then
else
s" kernelname" getenv? if ( a kernel has been loaded )
+ try-menu-unset
1 boot exit
then
load_kernel_and_modules
?dup if exit then
+ try-menu-unset
0 1 boot exit
then
load_kernel_and_modules
?dup 0= if 0 1 boot then
;
+
+\ ***** boot-conf
+\
+\ Prepares to boot as specified by loaded configuration files.
: boot-conf
0= if ( interpreted ) get_arguments then
More information about the freebsd-hackers
mailing list