X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Ftypes%2Ftypes.h;h=b7430f4910f6d5e6a97363aa5844b2064c872079;hp=5536e2a912e48c6df3025f6d6e288bb785257830;hb=9f42e56fc5968fcb34edfad017adb73960c2bb61;hpb=37bece9c6354e8857dc3001d6fd245d8a733ef28

diff --git a/lib/types/types.h b/lib/types/types.h
index 5536e2a..b7430f4 100644
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -8,11 +8,27 @@
 enum device_type {
 	DEVICE_TYPE_NETWORK,
 	DEVICE_TYPE_DISK,
+	DEVICE_TYPE_USB,
 	DEVICE_TYPE_OPTICAL,
 	DEVICE_TYPE_ANY,
 	DEVICE_TYPE_UNKNOWN,
 };
 
+enum ipmi_bootdev {
+	IPMI_BOOTDEV_NONE = 0x00,
+	IPMI_BOOTDEV_NETWORK = 0x01,
+	IPMI_BOOTDEV_DISK = 0x2,
+	IPMI_BOOTDEV_SAFE = 0x3,
+	IPMI_BOOTDEV_CDROM = 0x5,
+	IPMI_BOOTDEV_SETUP = 0x6,
+	IPMI_BOOTDEV_INVALID = 0xff,
+};
+
+const char *ipmi_bootdev_display_name(enum ipmi_bootdev bootdev);
+const char *device_type_display_name(enum device_type type);
+const char *device_type_name(enum device_type type);
+enum device_type find_device_type(const char *str);
+
 struct device {
 	char		*id;
 	enum device_type type;
@@ -36,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;
@@ -49,6 +66,8 @@ struct boot_command {
 	char *initrd_file;
 	char *dtb_file;
 	char *boot_args;
+	char *args_sig_file;
+	char *console;
 };
 
 struct boot_status {
@@ -77,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;
@@ -98,8 +126,10 @@ struct interface_config {
 		struct {
 			char *address;
 			char *gateway;
+			char *url;
 		} static_config;
 	};
+	bool	override;
 };
 
 struct network_config {
@@ -109,24 +139,39 @@ struct network_config {
 	unsigned int		n_dns_servers;
 };
 
-struct boot_priority {
-	/* Boot options with higher priority values will take precedence over
-	 * lower values. Negative priorities signify "don't boot this by
-	 * default".
-	 */
-	int			priority;
-	enum device_type	type;
+struct autoboot_option {
+	enum {
+		BOOT_DEVICE_TYPE,
+		BOOT_DEVICE_UUID
+	} boot_type;
+	union {
+		enum device_type	type;
+		char			*uuid;
+	};
 };
 
 struct config {
 	bool			autoboot_enabled;
 	unsigned int		autoboot_timeout_sec;
-	bool			safe_mode;
 	struct network_config	network;
-	struct boot_priority	*boot_priorities;
-	unsigned int		n_boot_priorities;
-	char			*boot_device;
+
+	struct autoboot_option	*autoboot_opts;
+	unsigned int		n_autoboot_opts;
+
+	unsigned int		ipmi_bootdev;
+	bool			ipmi_bootdev_persistent;
+
+	bool			allow_writes;
+
+	char			*boot_console;
 	char			*lang;
+
+	/* not user-settable */
+	unsigned int		n_consoles;
+	char			**consoles;
+	bool			disable_snapshots;
+	bool			safe_mode;
+	bool			debug;
 };
 
 #endif /* _TYPES_H */