X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Ftypes%2Ftypes.h;h=63f1b213c19261687e9ebd9c85272c0327882c59;hp=702b6f5f82286605cc00303f11cb2f84d4610150;hb=75c97cfd449b2bac8e61af1017a83bdf43f5e8fe;hpb=0dae90626e54e46372c9feddc2f9ac82f046547d

diff --git a/lib/types/types.h b/lib/types/types.h
index 702b6f5..63f1b21 100644
--- 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,16 +66,22 @@ struct boot_command {
 	char *initrd_file;
 	char *dtb_file;
 	char *boot_args;
+	char *args_sig_file;
+	char *console;
 };
 
-struct boot_status {
-	enum {
-		BOOT_STATUS_INFO,
-		BOOT_STATUS_ERROR,
+struct status {
+	enum status_type {
+		STATUS_INFO,
+		STATUS_ERROR,
 	} type;
 	char	*message;
-	char	*detail;
-	int	progress;
+	bool	backlog;
+};
+
+struct statuslog_entry {
+	struct status		*status;
+	struct list_item	list;
 };
 
 struct interface_info {
@@ -93,6 +100,14 @@ 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;
@@ -115,8 +130,10 @@ struct interface_config {
 		struct {
 			char *address;
 			char *gateway;
+			char *url;
 		} static_config;
 	};
+	bool	override;
 };
 
 struct network_config {
@@ -148,11 +165,18 @@ struct config {
 	unsigned int		ipmi_bootdev;
 	bool			ipmi_bootdev_persistent;
 
+	char			*http_proxy;
+	char			*https_proxy;
+
 	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;