Print this page
botadm patch

Split Close
Expand all
Collapse all
          --- old/bootadm/bootadm.h
          +++ new/bootadm/bootadm.h
↓ open down ↓ 118 lines elided ↑ open up ↑
 119  119          ROOT_CMD,
 120  120          KERNEL_CMD,
 121  121          KERNEL_DOLLAR_CMD,      /* Must be KERNEL_CMD + 1 */
 122  122          MODULE_CMD,
 123  123          MODULE_DOLLAR_CMD,      /* Must be MODULE_CMD + 1 */
 124  124          SEP_CMD,
 125  125          COMMENT_CMD,
 126  126          CHAINLOADER_CMD,
 127  127          ARGS_CMD,
 128  128          FINDROOT_CMD,
 129      -        BOOTFS_CMD
      129 +        BOOTFS_CMD,
      130 +        KERNEL_OPTIONS_CMD,
 130  131  } menu_cmd_t;
 131  132  
 132  133  extern char *menu_cmds[];
 133  134  
 134  135  /* For multi- or direct-boot */
 135  136  typedef enum {
 136  137          BAM_DIRECT_NOT_SET,
 137  138          BAM_DIRECT_MULTIBOOT,
 138  139          BAM_DIRECT_DBOOT
 139  140  } direct_or_multi_t;
↓ open down ↓ 70 lines elided ↑ open up ↑
 210  211   */
 211  212  #define BAM_LIBBE_FTR   "============ End of LIBBE entry ============="
 212  213  
 213  214  /* Title used for failsafe entries */
 214  215  #define FAILSAFE_TITLE  "Solaris failsafe"
 215  216  
 216  217  /* Title used for hv entries */
 217  218  #define NEW_HV_ENTRY    "Solaris xVM"
 218  219  
 219  220  /* ZFS boot option */
 220      -#define ZFS_BOOT        "-B $ZFS-BOOTFS"
      221 +#define ZFS_BOOT        "-B $ZFS_BOOTFS"
 221  222  
 222  223  /* multiboot */
 223  224  #define MULTI_BOOT      "/platform/i86pc/multiboot"
 224  225  #define MULTI_BOOT_FAILSAFE     "/boot/multiboot"
 225  226  #define MULTI_BOOT_FAILSAFE_UNIX        "kernel/unix"
 226  227  #define MULTI_BOOT_FAILSAFE_LINE        "/boot/multiboot kernel/unix -s"
 227  228  
 228  229  /* directboot kernels */
 229  230  #define DIRECT_BOOT_32  "/platform/i86pc/kernel/unix"
 230  231  #define DIRECT_BOOT_64  "/platform/i86pc/kernel/amd64/unix"
↓ open down ↓ 83 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX