/*
- * Copyright (C) 2003-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2010 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
{
struct udev *udev = udev_device_get_udev(dev);
struct stat stats;
- int preserve = 0;
int err = 0;
if (major(devnum) == 0)
if (lstat(file, &stats) == 0) {
if (((stats.st_mode & S_IFMT) == (mode & S_IFMT)) && (stats.st_rdev == devnum)) {
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 */
+ if (stats.st_mode != mode || stats.st_uid != uid || stats.st_gid != gid) {
+ info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
+ chmod(file, mode);
+ chown(file, uid, gid);
+ udev_selinux_lsetfilecon(udev, file, mode);
+ } else {
+ info(udev, "preserve permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
+ }
+ /* always update timestamp 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)];
if (err != 0) {
err(udev, "rename(%s, %s) failed: %m\n", file_tmp, file);
unlink(file_tmp);
+ goto exit;
}
+ info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
+ chmod(file, mode);
+ chown(file, uid, gid);
}
} else {
info(udev, "mknod(%s, %#o, (%u,%u))\n", file, mode, major(devnum), minor(devnum));
err = -errno;
udev_selinux_resetfscreatecon(udev);
} while (err == -ENOENT);
- if (err != 0) {
+ if (err != 0)
err(udev, "mknod(%s, %#o, (%u,%u) failed: %m\n", file, mode, major(devnum), minor(devnum));
- goto exit;
- }
- }
-
- if (!preserve || stats.st_mode != mode) {
- info(udev, "chmod(%s, %#o)\n", file, mode);
- err = chmod(file, mode);
- if (err != 0) {
- err(udev, "chmod(%s, %#o) failed: %m\n", file, mode);
- goto exit;
- }
- }
-
- if (!preserve || stats.st_uid != uid || stats.st_gid != gid) {
- info(udev, "chown(%s, %u, %u)\n", file, uid, gid);
- err = chown(file, uid, gid);
- if (err != 0) {
- err(udev, "chown(%s, %u, %u) failed: %m\n", file, uid, gid);
- goto exit;
- }
+ info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
+ chmod(file, mode);
+ chown(file, uid, gid);
}
exit:
return err;
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;
dbg(udev, "creating index: '%s'\n", filename);
do {
+ int fd;
+
err = util_create_path(udev, filename);
if (err != 0 && err != -ENOENT)
break;
- err = symlink(udev_device_get_devpath(dev), filename);
- if (err != 0)
+ 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;
return -1;
}
- 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);
+ if (udev_device_get_ignore_remove(dev)) {
+ info(udev, "ignore_remove for '%s'\n", udev_device_get_devnode(dev));
} else {
- info(udev, "removing device node '%s'\n", devnode);
- err = util_unlink_secure(udev, devnode);
+ struct udev_device *dev_check;
+
+ 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);
}
- udev_device_unref(dev_check);
num = udev_device_get_num_fake_partitions(dev);
if (num > 0) {
util_unlink_secure(udev, partitionname);
}
}
+
util_delete_path(udev, devnode);
return err;
}
~ianmdlvl / elogind.git / blobdiff