11581 'debug' loader option is a little obscure
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Rob Johnston <rob.johnston@joyent.com>

@@ -137,11 +137,11 @@
        [char] k addr len + c! len 1+ to len
      then
   else
     drop
   then
-  s" boot_debug" getenv dup -1 <> if
+  s" boot_drop_into_kmdb" getenv dup -1 <> if
      s" YES" compare-insensitive 0= if
        [char] d addr len + c! len 1+ to len
      then
   else
     drop

@@ -254,16 +254,16 @@
 
 only forth definitions also support-functions
 
    in case the boot-args is set, parse it and extract following options:  -a
 to boot_ask=YES  -s to boot_single=YES  -v to boot_verbose=YES  -k to
-boot_kmdb=YES  -d to boot_debug=YES  -r to boot_reconfigure=YES  -B acpi-user-
-options=X to acpi-user-options=X    This is needed so that the menu can manage
-these options. Unfortunately, this  also means that boot-args will override
-previously set options, but we have no  way to control the processing order
-here. boot-args will be rebuilt at boot.     NOTE: The best way to address the
-order is to *not* set any above options  in boot-args.
+boot_kmdb=YES  -d to boot_drop_into_kmdb=YES  -r to boot_reconfigure=YES  -B
+acpi-user-options=X to acpi-user-options=X    This is needed so that the menu
+can manage these options. Unfortunately, this  also means that boot-args will
+override previously set options, but we have no  way to control the processing
+order here. boot-args will be rebuilt at boot.     NOTE: The best way to
+address the order is to *not* set any above options  in boot-args.
 
 : parse-boot-args  { | baddr blen -- }
   s" boot-args" getenv dup -1 = if drop exit then
   to blen
   to baddr

@@ -358,14 +358,14 @@
       begin               loop till ' ' or 0      dup c@ dup 0<> swap bl <>
 and
       while    dup c@ [char] s = if       s" set boot_single=YES" evaluate
 TRUE      else dup c@ [char] v = if       s" set boot_verbose=YES" evaluate
 TRUE      else dup c@ [char] k = if       s" set boot_kmdb=YES" evaluate TRUE
-     else dup c@ [char] d = if       s" set boot_debug=YES" evaluate TRUE
-     else dup c@ [char] r = if       s" set boot_reconfigure=YES" evaluate
-TRUE      else dup c@ [char] a = if       s" set boot_ask=YES" evaluate TRUE
-     then then then then then then      dup TRUE = if    drop      dup >r
+     else dup c@ [char] d = if       s" set boot_drop_into_kmdb=YES" evaluate
+TRUE      else dup c@ [char] r = if       s" set boot_reconfigure=YES"
+evaluate TRUE  else dup c@ [char] a = if       s" set boot_ask=YES" evaluate
+TRUE      then then then then then then      dup TRUE = if    drop      dup >r
           ( addr len len' addr' R: addr' )     1+ swap 1-        ( addr len
 addr'+1 len'-1 R: addr' )       r> swap move      ( addr len )
 
        2drop baddr blen 1-       check if we have space after '-', if so, drop
 '- '        swap dup 1+ c@ bl = if            2 + swap 2 -    else