diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2013-09-24 17:31:50 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2013-09-24 17:31:50 +0800 |
commit | 995e08e3de9aaff81e72227587ffcb4cc78175d0 (patch) | |
tree | 3f523456384a0e5431c61eb5373c185614853736 /discover/device-handler.c | |
parent | 25e4608e9e4572b3a835f7c43a8ec9c77125f492 (diff) | |
download | talos-petitboot-995e08e3de9aaff81e72227587ffcb4cc78175d0.tar.gz talos-petitboot-995e08e3de9aaff81e72227587ffcb4cc78175d0.zip |
discover: Check for devices with duplicate serial properties
If we have multipath devices present in the system, we'll end up with
duplicate mounts, parse results and boot options. This change adds a
check to see if we've encountered a device with this serial number
previously.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/device-handler.c')
-rw-r--r-- | discover/device-handler.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c index 95d2039..251c517 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -103,6 +103,12 @@ static int device_match_id(struct discover_device *dev, const char *id) return !strcmp(dev->device->id, id); } +static int device_match_serial(struct discover_device *dev, const char *serial) +{ + const char *val = discover_device_get_param(dev, "ID_SERIAL"); + return val && !strcmp(val, serial); +} + static struct discover_device *device_lookup( struct device_handler *device_handler, int (match_fn)(struct discover_device *, const char *), @@ -154,6 +160,13 @@ struct discover_device *device_lookup_by_id( return device_lookup(device_handler, device_match_id, id); } +struct discover_device *device_lookup_by_serial( + struct device_handler *device_handler, + const char *serial) +{ + return device_lookup(device_handler, device_match_serial, serial); +} + void device_handler_destroy(struct device_handler *handler) { talloc_free(handler); |