botadm patch

@@ -124,11 +124,12 @@
         SEP_CMD,
         COMMENT_CMD,
         CHAINLOADER_CMD,
         ARGS_CMD,
         FINDROOT_CMD,
-        BOOTFS_CMD
+        BOOTFS_CMD,
+        KERNEL_OPTIONS_CMD,
 } menu_cmd_t;
 
 extern char *menu_cmds[];
 
 /* For multi- or direct-boot */

@@ -215,11 +216,11 @@
 
 /* Title used for hv entries */
 #define NEW_HV_ENTRY    "Solaris xVM"
 
 /* ZFS boot option */
-#define ZFS_BOOT        "-B $ZFS-BOOTFS"
+#define ZFS_BOOT        "-B $ZFS_BOOTFS"
 
 /* multiboot */
 #define MULTI_BOOT      "/platform/i86pc/multiboot"
 #define MULTI_BOOT_FAILSAFE     "/boot/multiboot"
 #define MULTI_BOOT_FAILSAFE_UNIX        "kernel/unix"