X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-node.c;h=9add76547f1437dae86674c57c341375074217cd;hb=2be7287b0eb88ec7ebc3117e59554c2f6e7ac9e4;hp=3c9846f158a41e198268244299c5306f05245446;hpb=e9a5ef7cddcfcdb29b5aef3896931132b6fd5165;p=elogind.git

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 3c9846f15..9add76547 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -67,21 +67,8 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
         /* preserve link with correct target, do not replace node of other device */
         if (lstat(slink, &stats) == 0) {
                 if (S_ISBLK(stats.st_mode) || S_ISCHR(stats.st_mode)) {
-                        struct stat stats2;
-
-                        log_debug("found existing node instead of symlink '%s'\n", slink);
-                        if (lstat(node, &stats2) == 0) {
-                                if ((stats.st_mode & S_IFMT) == (stats2.st_mode & S_IFMT) &&
-                                    stats.st_rdev == stats2.st_rdev && stats.st_ino != stats2.st_ino) {
-                                        log_debug("replace device node '%s' with symlink to our node '%s'\n",
-                                             slink, node);
-                                } else {
-                                        log_error("device node '%s' already exists, "
-                                            "link to '%s' will not overwrite it\n",
-                                            slink, node);
-                                        goto exit;
-                                }
-                        }
+                        log_error("conflicting device node '%s' found, link to '%s' will not be created\n", slink, node);
+                        goto exit;
                 } else if (S_ISLNK(stats.st_mode)) {
                         char buf[UTIL_PATH_SIZE];
                         int len;
@@ -91,7 +78,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
                                 buf[len] = '\0';
                                 if (strcmp(target, buf) == 0) {
                                         log_debug("preserve already existing symlink '%s' to '%s'\n", slink, target);
-                                        label_fix(slink, true);
+                                        label_fix(slink, true, false);
                                         utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
                                         goto exit;
                                 }
@@ -100,7 +87,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
         } else {
                 log_debug("creating symlink '%s' to '%s'\n", slink, target);
                 do {
-                        err = mkdir_parents(slink, 0755);
+                        err = mkdir_parents_label(slink, 0755);
                         if (err != 0 && err != -ENOENT)
                                 break;
                         label_context_set(slink, S_IFLNK);
@@ -117,7 +104,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
         util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL);
         unlink(slink_tmp);
         do {
-                err = mkdir_parents(slink_tmp, 0755);
+                err = mkdir_parents_label(slink_tmp, 0755);
                 if (err != 0 && err != -ENOENT)
                         break;
                 label_context_set(slink_tmp, S_IFLNK);
@@ -307,7 +294,7 @@ static int node_fixup(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid
          * something else has set a custom context in the meantime.
          */
         if (strcmp(udev_device_get_action(dev), "add") == 0)
-                label_fix(devnode, true);
+            label_fix(devnode, true, false);
 
         /* always update timestamp when we re-use the node, like on media change events */
         utimensat(AT_FDCWD, devnode, NULL, 0);