X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Ftypes%2Ftypes.h;h=f5392c89c4a7b1715622cf3d7520e956e24ac30b;hp=63c1c7c811aaed6deb2ba26630dc23d7611eb668;hb=2bc0df4aa35a89c5af7e54f459e2bbde20ca6a7e;hpb=d531395a3ff60730238854b127925978f6eab289

diff --git a/lib/types/types.h b/lib/types/types.h
index 63c1c7c..f5392c8 100644
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -52,11 +52,32 @@ struct boot_option {
 	char		*initrd_file;
 	char		*dtb_file;
 	char		*boot_args;
+	char		*args_sig_file;
 	bool		is_default;
 
 	struct list_item	list;
 
 	void		*ui_info;
+
+	enum {
+		DISCOVER_BOOT_OPTION,
+		DISCOVER_PLUGIN_OPTION,
+	} type;
+};
+
+struct plugin_option {
+	char		*id;
+	char		*name;
+	char		*vendor;
+	char		*vendor_id;
+	char		*version;
+	char		*date;
+	char		*plugin_file;
+
+	unsigned int	n_executables;
+	char		**executables;
+
+	void		*ui_info;
 };
 
 struct boot_command {
@@ -65,16 +86,23 @@ 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;
+	bool	boot_active;
+};
+
+struct statuslog_entry {
+	struct status		*status;
+	struct list_item	list;
 };
 
 struct interface_info {
@@ -82,6 +110,8 @@ struct interface_info {
 	uint8_t		*hwaddr;
 	char		*name;
 	bool		link;
+	char		*address;
+	char		*address_v6;
 };
 
 struct blockdev_info {
@@ -93,9 +123,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 +156,7 @@ struct interface_config {
 			char *url;
 		} static_config;
 	};
+	bool	override;
 };
 
 struct network_config {
@@ -157,14 +188,23 @@ 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;
 };
 
+bool config_autoboot_active(const struct config *config);
+
 #endif /* _TYPES_H */