X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Ftypes%2Ftypes.c;h=d7f4ead791d2e7e312bdd531f834cbbee65ac67e;hp=611f2a1018dba2f772b90ad245508339aa07dc53;hb=d0602ed25e3bff8298c19bece8cd8b3f80d86624;hpb=70907c3fc4b344d00ce900e6a536e9cc16a35216

diff --git a/lib/types/types.c b/lib/types/types.c
index 611f2a1..d7f4ead 100644
--- a/lib/types/types.c
+++ b/lib/types/types.c
@@ -30,7 +30,7 @@ const char *device_type_display_name(enum device_type type)
 	case DEVICE_TYPE_USB:
 		return _("USB");
 	case DEVICE_TYPE_OPTICAL:
-		return _("Optical");
+		return _("CD/DVD");
 	case DEVICE_TYPE_NETWORK:
 		return _("Network");
 	case DEVICE_TYPE_ANY:
@@ -75,3 +75,15 @@ enum device_type find_device_type(const char *str)
 
 	return DEVICE_TYPE_UNKNOWN;
 }
+
+bool config_autoboot_active(const struct config *config)
+{
+	enum ipmi_bootdev bootdev = config->ipmi_bootdev;
+
+	if (!config->autoboot_enabled)
+		return false;
+	if (bootdev == IPMI_BOOTDEV_SETUP || bootdev == IPMI_BOOTDEV_SAFE)
+		return false;
+
+	return true;
+}