shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

device: handle properly if two devices want to have the same name

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=624539
This commit is contained in:
Lennart Poettering 2010-08-20 04:04:05 +02:00
parent 90685f7d12
commit 5845b46ba3
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/device.c
View File

@ -188,12 +188,12 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
if ((r = device_find_escape_name(m, path, &u)) < 0) if ((r = device_find_escape_name(m, path, &u)) < 0)
return r; return r;
/* If this is a different unit, then let's not merge things */ /* If a different unit already claimed this name then let's do
if (u && DEVICE(u)->sysfs && !path_equal(DEVICE(u)->sysfs, sysfs)) { * nothing. This can happen for example when two disks with
log_error("Hmm, something's broken. Asked to create two devices with same name but different sysfs paths. (%s vs %s)", * the same label are plugged in, and which hence try to get
DEVICE(u)->sysfs, sysfs); * conflicting symlinks in /dev/disk/by-label/xxxx */
if (u && DEVICE(u)->sysfs && !path_equal(DEVICE(u)->sysfs, sysfs))
return -EEXIST; return -EEXIST;
}
if (!u) { if (!u) {
delete = true; delete = true;
@ -308,6 +308,7 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
first = udev_device_get_devlinks_list_entry(dev); first = udev_device_get_devlinks_list_entry(dev);
udev_list_entry_foreach(item, first) { udev_list_entry_foreach(item, first) {
const char *p; const char *p;
struct stat st;
/* Don't bother with the /dev/block links */ /* Don't bother with the /dev/block links */
p = udev_list_entry_get_name(item); p = udev_list_entry_get_name(item);
@ -316,6 +317,18 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
path_startswith(p, "/dev/char/")) path_startswith(p, "/dev/char/"))
continue; continue;
/* Verify that the symlink in the FS actually belongs
* to this device. This is useful to deal with
* conflicting devices, e.g. when two disks want the
* same /dev/disk/by-label/xxx link because they have
* the same label. We want to make sure that the same
* device that won the symlink wins in systemd, so we
* check the device node major/minor*/
if (stat(p, &st) >= 0)
if ((!S_ISBLK(st.st_mode) && !S_ISCHR(st.st_mode)) ||
st.st_rdev != udev_device_get_devnum(dev))
continue;
device_update_unit(m, dev, p, false); device_update_unit(m, dev, p, false);
} }