Consolidate display string for optical devices

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 31cbcc2c1da50b87b9b5bf472227ebe2ce8559ab..9246f0dd865ea3218f6bb5d6869553a64295e1ba 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -457,6 +457,7 @@ struct {
 } device_type_map[] = {
        { IPMI_BOOTDEV_NETWORK, DEVICE_TYPE_NETWORK },
        { IPMI_BOOTDEV_DISK, DEVICE_TYPE_DISK },
+       { IPMI_BOOTDEV_DISK, DEVICE_TYPE_USB },
        { IPMI_BOOTDEV_CDROM, DEVICE_TYPE_OPTICAL },
 };
 
@@ -1391,10 +1392,15 @@ static int umount_device(struct discover_device *dev)
 int device_request_write(struct discover_device *dev, bool *release)
 {
        const char *fstype, *device_path;
+       const struct config *config;
        int rc;
 
        *release = false;
 
+       config = config_get();
+       if (!config->allow_writes)
+               return -1;
+
        if (!dev->mounted)
                return -1;