X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=6212e4309137f47feb97cd0b09043193fdc13191;hp=e996e221228804d6a16a7a41aeb25463198800a8;hb=b16b116422f1fb817924f4d2c3d9b1354da35614;hpb=995e08e3de9aaff81e72227587ffcb4cc78175d0 diff --git a/discover/udev.c b/discover/udev.c index e996e22..6212e43 100644 --- a/discover/udev.c +++ b/discover/udev.c @@ -73,6 +73,7 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev) const char *serial; const char *path; const char *name; + const char *prop; name = udev_device_get_sysname(dev); if (!name) { @@ -114,8 +115,12 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev) ddev = discover_device_create(udev->handler, name); ddev->device_path = udev_device_get_devnode(dev); - ddev->uuid = udev_device_get_property_value(dev, "ID_FS_UUID"); - ddev->label = udev_device_get_property_value(dev, "ID_FS_LABEL"); + prop = udev_device_get_property_value(dev, "ID_FS_UUID"); + if (prop) + ddev->uuid = talloc_strdup(ddev, prop); + prop = udev_device_get_property_value(dev, "ID_FS_LABEL"); + if (prop) + ddev->label = talloc_strdup(ddev, prop); ddev->device->type = DEVICE_TYPE_DISK; udev_setup_device_params(dev, ddev);