Consolidate petitboot,tty and petitboot,console

[petitboot] / lib / types / types.h

diff --git a/lib/types/types.h b/lib/types/types.h
index f7e47522dcd818d6b2a226e469fd7ee48543f50e..31922d0d81fb01b75256173e8f9b5c881aefba17 100644 (file)
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -8,6 +8,7 @@
 enum device_type {
        DEVICE_TYPE_NETWORK,
        DEVICE_TYPE_DISK,
+       DEVICE_TYPE_USB,
        DEVICE_TYPE_OPTICAL,
        DEVICE_TYPE_ANY,
        DEVICE_TYPE_UNKNOWN,
@@ -51,6 +52,7 @@ struct boot_option {
        char            *initrd_file;
        char            *dtb_file;
        char            *boot_args;
+       char            *args_sig_file;
        bool            is_default;
 
        struct list_item        list;
@@ -64,6 +66,8 @@ struct boot_command {
        char *initrd_file;
        char *dtb_file;
        char *boot_args;
+       char *args_sig_file;
+       char *console;
 };
 
 struct boot_status {
@@ -92,6 +96,15 @@ struct blockdev_info {
 struct system_info {
        char                    *type;
        char                    *identifier;
+       char                    **platform_primary;
+       char                    **platform_other;
+       unsigned int            n_primary;
+       unsigned int            n_other;
+       char                    **bmc_current;
+       char                    **bmc_golden;
+       unsigned int            n_bmc_current;
+       unsigned int            n_bmc_golden;
+       uint8_t                 *bmc_mac;
        struct interface_info   **interfaces;
        unsigned int            n_interfaces;
        struct blockdev_info    **blockdevs;
@@ -113,8 +126,10 @@ struct interface_config {
                struct {
                        char *address;
                        char *gateway;
+                       char *url;
                } static_config;
        };
+       bool    override;
 };
 
 struct network_config {
@@ -148,9 +163,14 @@ struct config {
 
        bool                    allow_writes;
 
+       char                    *boot_console;
+       bool                    manual_console;
        char                    *lang;
 
        /* not user-settable */
+       unsigned int            n_consoles;
+       char                    **consoles;
+       bool                    disable_snapshots;
        bool                    safe_mode;
        bool                    debug;
 };