X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Ftypes%2Ftypes.h;h=506510b1fbbfc0775a3999e701a0158f5da3ebc4;hp=6b607cdeecccfd622a5ee3cf0c33a41b52cbe2b4;hb=211d7eb1de2d3a9cd97846deb9a85a934dae2981;hpb=86c9d34380b0074dab1ba89a569a94280d6999c4

diff --git a/lib/types/types.h b/lib/types/types.h
index 6b607cd..506510b 100644
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -67,17 +67,15 @@ struct boot_command {
 	char *dtb_file;
 	char *boot_args;
 	char *args_sig_file;
-	char *tty;
+	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;
 };
 
 struct interface_info {
@@ -129,6 +127,7 @@ struct interface_config {
 			char *url;
 		} static_config;
 	};
+	bool	override;
 };
 
 struct network_config {
@@ -160,14 +159,18 @@ struct config {
 	unsigned int		ipmi_bootdev;
 	bool			ipmi_bootdev_persistent;
 
+	char			*http_proxy;
+	char			*https_proxy;
+
 	bool			allow_writes;
 
-	char			*boot_tty;
+	char			*boot_console;
+	bool			manual_console;
 	char			*lang;
 
 	/* not user-settable */
-	unsigned int		n_tty;
-	char			**tty_list;
+	unsigned int		n_consoles;
+	char			**consoles;
 	bool			disable_snapshots;
 	bool			safe_mode;
 	bool			debug;