#include <errno.h>
#include <grp.h>
#include <dirent.h>
+#include <sys/time.h>
#include <sys/stat.h>
#include <sys/types.h>
info(udev, "preserve file '%s', because it has correct dev_t\n", file);
preserve = 1;
udev_selinux_lsetfilecon(udev, file, mode);
+ /* update time stamp when we re-use the node, like on media change events */
+ utimensat(AT_FDCWD, file, NULL, 0);
} else {
char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
} else {
info(udev, "mknod(%s, %#o, (%u,%u))\n", file, mode, major(devnum), minor(devnum));
do {
- util_create_path(udev, file);
+ err = util_create_path(udev, file);
+ if (err != 0 && err != -ENOENT)
+ break;
udev_selinux_setfscreatecon(udev, file, mode);
err = mknod(file, mode, devnum);
if (err != 0)
- err = errno;
+ err = -errno;
udev_selinux_resetfscreatecon(udev);
- } while (err == ENOENT);
+ } while (err == -ENOENT);
if (err != 0) {
err(udev, "mknod(%s, %#o, (%u,%u) failed: %m\n", file, mode, major(devnum), minor(devnum));
goto exit;
info(udev, "preserve already existing symlink '%s' to '%s'\n",
slink, target);
udev_selinux_lsetfilecon(udev, slink, S_IFLNK);
+ utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
goto exit;
}
}
} else {
info(udev, "creating symlink '%s' to '%s'\n", slink, target);
do {
- util_create_path(udev, slink);
+ err = util_create_path(udev, slink);
+ if (err != 0 && err != -ENOENT)
+ break;
udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
err = symlink(target, slink);
if (err != 0)
- err = errno;
+ err = -errno;
udev_selinux_resetfscreatecon(udev);
- } while (err == ENOENT);
+ } while (err == -ENOENT);
if (err == 0)
goto exit;
}
util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL);
unlink(slink_tmp);
do {
- util_create_path(udev, slink);
- udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
+ err = util_create_path(udev, slink_tmp);
+ if (err != 0 && err != -ENOENT)
+ break;
+ udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK);
err = symlink(target, slink_tmp);
if (err != 0)
- err = errno;
+ err = -errno;
udev_selinux_resetfscreatecon(udev);
- } while (err == ENOENT);
+ } while (err == -ENOENT);
if (err != 0) {
err(udev, "symlink(%s, %s) failed: %m\n", target, slink_tmp);
goto exit;
for (;;) {
struct udev_device *dev_db;
struct dirent *dent;
- char devpath[UTIL_PATH_SIZE];
- char syspath[UTIL_PATH_SIZE];
- ssize_t len;
+ int maj, min;
+ char type, type2;
+ dev_t devnum;
dent = readdir(dir);
if (dent == NULL || dent->d_name[0] == '\0')
break;
if (dent->d_name[0] == '.')
continue;
- dbg(udev, "found '%s/%s'\n", stackdir, dent->d_name);
- len = readlinkat(dirfd(dir), dent->d_name, devpath, sizeof(devpath));
- if (len <= 0 || len == (ssize_t)sizeof(devpath))
+ if (sscanf(dent->d_name, "%c%i:%i", &type, &maj, &min) != 3)
continue;
- devpath[len] = '\0';
- util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), devpath, NULL);
- info(udev, "found '%s' claiming '%s'\n", syspath, stackdir);
+ info(udev, "found '%c%i:%i' claiming '%s'\n", type, maj, min, stackdir);
+ devnum = makedev(maj, min);
/* did we find ourself? */
- if (strcmp(udev_device_get_syspath(dev), syspath) == 0)
+ type2 = strcmp(udev_device_get_subsystem(dev), "block") == 0 ? 'b' : 'c';
+ if (udev_device_get_devnum(dev) == devnum && type == type2)
continue;
- dev_db = udev_device_new_from_syspath(udev, syspath);
+ dev_db = udev_device_new_from_devnum(udev, type, devnum);
if (dev_db != NULL) {
const char *devnode;
udev_device_get_devnode(dev_db), udev_device_get_devlink_priority(dev_db));
if (target == NULL || udev_device_get_devlink_priority(dev_db) > priority) {
info(udev, "'%s' claims priority %i for '%s'\n",
- syspath, udev_device_get_devlink_priority(dev_db), stackdir);
+ udev_device_get_syspath(dev_db), udev_device_get_devlink_priority(dev_db), stackdir);
priority = udev_device_get_devlink_priority(dev_db);
util_strscpy(buf, bufsize, devnode);
target = buf;
udev_device_unref(dev_db);
}
}
+ closedir(dir);
return target;
}
}
if (add) {
+ int err;
+
dbg(udev, "creating index: '%s'\n", filename);
do {
- util_create_path(udev, filename);
- symlink(udev_device_get_devpath(dev), filename);
- } while (errno == ENOENT);
+ int fd;
+
+ err = util_create_path(udev, filename);
+ if (err != 0 && err != -ENOENT)
+ break;
+ fd = open(filename, O_WRONLY|O_CREAT, 0444);
+ if (fd >= 0)
+ close(fd);
+ else
+ err = -errno;
+ } while (err == -ENOENT);
}
}
/* create/update symlinks, add symlinks to name index */
udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
- if (udev_list_entry_get_flag(list_entry))
+ if (udev_list_entry_get_flags(list_entry))
/* simple unmanaged link name */
node_symlink(udev, udev_device_get_devnode(dev), udev_list_entry_get_name(list_entry));
else
const char *devnode;
char partitionname[UTIL_PATH_SIZE];
struct stat stats;
+ struct udev_device *dev_check;
int err = 0;
int num;
- /* remove,update symlinks, remove symlinks from name index */
+ /* remove/update symlinks, remove symlinks from name index */
udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev))
link_update(dev, udev_list_entry_get_name(list_entry), 0);
return -1;
}
- info(udev, "removing device node '%s'\n", devnode);
- err = util_unlink_secure(udev, devnode);
- if (err)
- return err;
+ dev_check = udev_device_new_from_syspath(udev, udev_device_get_syspath(dev));
+ if (dev_check != NULL && stats.st_rdev == udev_device_get_devnum(dev_check)) {
+ /* do not remove device node if the same sys-device is re-created in the meantime */
+ info(udev, "keeping device node of existing device'%s'\n", devnode);
+ } else {
+ info(udev, "removing device node '%s'\n", devnode);
+ err = util_unlink_secure(udev, devnode);
+ }
+ udev_device_unref(dev_check);
num = udev_device_get_num_fake_partitions(dev);
if (num > 0) {
~ianmdlvl / elogind.git / blobdiff