Consolidate petitboot,tty and petitboot,console

[petitboot] / lib / types / types.h

diff --git a/lib/types/types.h b/lib/types/types.h
index 63c1c7c811aaed6deb2ba26630dc23d7611eb668..31922d0d81fb01b75256173e8f9b5c881aefba17 100644 (file)
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -52,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;
@@ -65,6 +66,8 @@ struct boot_command {
        char *initrd_file;
        char *dtb_file;
        char *boot_args;
+       char *args_sig_file;
+       char *console;
 };
 
 struct boot_status {
@@ -93,9 +96,9 @@ struct blockdev_info {
 struct system_info {
        char                    *type;
        char                    *identifier;
-       char                    **platform_current;
+       char                    **platform_primary;
        char                    **platform_other;
-       unsigned int            n_current;
+       unsigned int            n_primary;
        unsigned int            n_other;
        char                    **bmc_current;
        char                    **bmc_golden;
@@ -126,6 +129,7 @@ struct interface_config {
                        char *url;
                } static_config;
        };
+       bool    override;
 };
 
 struct network_config {
@@ -159,9 +163,13 @@ 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;