#include "mangle.h"
#include "path.h"
#include "nls.h"
+#include "strutils.h"
#include "lsblk.h"
free(p->parttype);
free(p->partuuid);
free(p->partlabel);
+ free(p->partn);
free(p->wwn);
free(p->serial);
free(p->model);
free(p->partflags);
+ free(p->idlink);
+ free(p->revision);
free(p->mode);
free(p->owner);
return NULL;
}
#else
+
+#define LSBLK_UDEV_BYID_PREFIX "/dev/disk/by-id/"
+#define LSBLK_UDEV_BYID_PREFIXSZ (sizeof(LSBLK_UDEV_BYID_PREFIX) - 1)
+
static struct lsblk_devprop *get_properties_by_udev(struct lsblk_device *ld)
{
struct udev_device *dev;
+ struct udev_list_entry *le;
+ const char *data;
+ struct lsblk_devprop *prop;
+ size_t len;
if (ld->udev_requested)
return ld->properties;
goto done;
dev = udev_device_new_from_subsystem_sysname(udev, "block", ld->name);
- if (dev) {
- const char *data;
- struct lsblk_devprop *prop;
-
- if (ld->properties)
- lsblk_device_free_properties(ld->properties);
- prop = ld->properties = xcalloc(1, sizeof(*ld->properties));
+ if (!dev)
+ goto done;
- if ((data = udev_device_get_property_value(dev, "ID_FS_LABEL_ENC"))) {
- prop->label = xstrdup(data);
- unhexmangle_string(prop->label);
- }
- if ((data = udev_device_get_property_value(dev, "ID_FS_UUID_ENC"))) {
- prop->uuid = xstrdup(data);
- unhexmangle_string(prop->uuid);
- }
- if ((data = udev_device_get_property_value(dev, "ID_PART_TABLE_UUID")))
- prop->ptuuid = xstrdup(data);
- if ((data = udev_device_get_property_value(dev, "ID_PART_TABLE_TYPE")))
- prop->pttype = xstrdup(data);
- if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_NAME"))) {
- prop->partlabel = xstrdup(data);
- unhexmangle_string(prop->partlabel);
- }
- if ((data = udev_device_get_property_value(dev, "ID_FS_TYPE")))
- prop->fstype = xstrdup(data);
- if ((data = udev_device_get_property_value(dev, "ID_FS_VERSION")))
- prop->fsversion = xstrdup(data);
- if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")))
- prop->parttype = xstrdup(data);
- if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_UUID")))
- prop->partuuid = xstrdup(data);
- if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_FLAGS")))
- prop->partflags = xstrdup(data);
+ DBG(DEV, ul_debugobj(ld, "%s: found udev properties", ld->name));
- data = udev_device_get_property_value(dev, "ID_WWN_WITH_EXTENSION");
- if (!data)
- data = udev_device_get_property_value(dev, "ID_WWN");
- if (data)
- prop->wwn = xstrdup(data);
+ if (ld->properties)
+ lsblk_device_free_properties(ld->properties);
+ prop = ld->properties = xcalloc(1, sizeof(*ld->properties));
+ if ((data = udev_device_get_property_value(dev, "ID_FS_LABEL_ENC"))) {
+ prop->label = xstrdup(data);
+ unhexmangle_string(prop->label);
+ }
+ if ((data = udev_device_get_property_value(dev, "ID_FS_UUID_ENC"))) {
+ prop->uuid = xstrdup(data);
+ unhexmangle_string(prop->uuid);
+ }
+ if ((data = udev_device_get_property_value(dev, "ID_PART_TABLE_UUID")))
+ prop->ptuuid = xstrdup(data);
+ if ((data = udev_device_get_property_value(dev, "ID_PART_TABLE_TYPE")))
+ prop->pttype = xstrdup(data);
+ if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_NAME"))) {
+ prop->partlabel = xstrdup(data);
+ unhexmangle_string(prop->partlabel);
+ }
+ if ((data = udev_device_get_property_value(dev, "ID_FS_TYPE")))
+ prop->fstype = xstrdup(data);
+ if ((data = udev_device_get_property_value(dev, "ID_FS_VERSION")))
+ prop->fsversion = xstrdup(data);
+ if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")))
+ prop->parttype = xstrdup(data);
+ if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_UUID")))
+ prop->partuuid = xstrdup(data);
+ if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_NUMBER")))
+ prop->partn = xstrdup(data);
+ if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_FLAGS")))
+ prop->partflags = xstrdup(data);
+
+ data = udev_device_get_property_value(dev, "ID_WWN_WITH_EXTENSION");
+ if (!data)
+ data = udev_device_get_property_value(dev, "ID_WWN");
+ if (data)
+ prop->wwn = xstrdup(data);
+
+ data = udev_device_get_property_value(dev, "SCSI_IDENT_SERIAL"); /* sg3_utils do not use I_D prefix */
+ if (!data)
data = udev_device_get_property_value(dev, "ID_SCSI_SERIAL");
- if(!data)
- data = udev_device_get_property_value(dev, "ID_SERIAL_SHORT");
- if(!data)
- data = udev_device_get_property_value(dev, "ID_SERIAL");
- if (data)
- prop->serial = xstrdup(data);
-
- if ((data = udev_device_get_property_value(dev, "ID_MODEL")))
- prop->model = xstrdup(data);
-
- udev_device_unref(dev);
- DBG(DEV, ul_debugobj(ld, "%s: found udev properties", ld->name));
+ if(!data)
+ data = udev_device_get_property_value(dev, "ID_SERIAL_SHORT");
+ if(!data)
+ data = udev_device_get_property_value(dev, "ID_SERIAL");
+ if (data) {
+ prop->serial = xstrdup(data);
+ normalize_whitespace((unsigned char *) prop->serial);
+ }
+
+ if ((data = udev_device_get_property_value(dev, "ID_REVISION")))
+ prop->revision = xstrdup(data);
+
+ if ((data = udev_device_get_property_value(dev, "ID_MODEL_ENC"))) {
+ prop->model = xstrdup(data);
+ unhexmangle_string(prop->model);
+ normalize_whitespace((unsigned char *) prop->model);
+ } else if ((data = udev_device_get_property_value(dev, "ID_MODEL"))) {
+ prop->model = xstrdup(data);
+ normalize_whitespace((unsigned char *) prop->model);
+ }
+
+ /* select the shortest udev by-id symlink */
+ len = 0;
+ udev_list_entry_foreach(le, udev_device_get_devlinks_list_entry(dev)) {
+ const char *name = udev_list_entry_get_name(le);
+ size_t sz;
+
+ if (!name || !startswith(name, LSBLK_UDEV_BYID_PREFIX))
+ continue;
+ name += LSBLK_UDEV_BYID_PREFIXSZ;
+ if (!*name)
+ continue;
+ sz = strlen(name);
+ if (!len || sz < len) {
+ len = sz;
+ free(prop->idlink);
+ prop->idlink = xstrdup(name);
+ }
}
+ udev_device_unref(dev);
done:
ld->udev_requested = 1;
return NULL;
if (ul_path_set_prefix(pc, lsblk->sysroot) != 0)
goto done;
- if (ul_path_stat(pc, &sb, ld->filename) != 0 || !S_ISREG(sb.st_mode))
+ if (ul_path_stat(pc, &sb, 0, ld->filename) != 0 || !S_ISREG(sb.st_mode))
goto done;
fp = ul_path_fopen(pc, "r", ld->filename);
else if (lookup(buf, "ID_PART_ENTRY_TYPE", &prop->parttype)) ;
else if (lookup(buf, "ID_PART_ENTRY_UUID", &prop->partuuid)) ;
else if (lookup(buf, "ID_PART_ENTRY_FLAGS", &prop->partflags)) ;
+ else if (lookup(buf, "ID_PART_ENTRY_NUMBER", &prop->partn)) ;
else if (lookup(buf, "ID_MODEL", &prop->model)) ;
else if (lookup(buf, "ID_WWN_WITH_EXTENSION", &prop->wwn)) ;
else if (lookup(buf, "ID_WWN", &prop->wwn)) ;
- else if (lookup(buf, "ID_SCSI_IDENT_SERIAL", &prop->serial)) ; /* serial from sg3_utils */
+ else if (lookup(buf, "SCSI_IDENT_SERIAL", &prop->serial)) ; /* serial from sg3_utils */
else if (lookup(buf, "ID_SCSI_SERIAL", &prop->serial)) ;
else if (lookup(buf, "ID_SERIAL_SHORT", &prop->serial)) ;
else if (lookup(buf, "ID_SERIAL", &prop->serial)) ;
+ else if (lookup(buf, "ID_REVISION", &prop->revision)) ;
/* lsblk specific */
else if (lookup(buf, "MODE", &prop->mode)) ;
prop->partlabel = xstrdup(data);
if (!blkid_probe_lookup_value(pr, "PART_ENTRY_FLAGS", &data, NULL))
prop->partflags = xstrdup(data);
+ if (!blkid_probe_lookup_value(pr, "PART_ENTRY_NUMBER", &data, NULL))
+ prop->partn = xstrdup(data);
DBG(DEV, ul_debugobj(dev, "%s: found blkid properties", dev->name));
}
projects / thirdparty / util-linux.git / blobdiff