rule_generator: fix wrong DRIVERS!= logic

[elogind.git] / udev_node.c

diff --git a/udev_node.c b/udev_node.c
index 8c0287405c537505bc80a32423c44090fabcffc4..fcd52d0e45d5d9b861a353267bfbf5c56d64f64c 100644 (file)
--- a/udev_node.c
+++ b/udev_node.c
@@ -46,24 +46,24 @@ int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t m
        else
                mode |= S_IFCHR;
 
-       /* preserve node with already correct numbers, to prevent changing the inode number */
        if (lstat(file, &stats) == 0) {
                if ((stats.st_mode & S_IFMT) == (mode & S_IFMT) && (stats.st_rdev == devt)) {
                        info("preserve file '%s', because it has correct dev_t", file);
                        selinux_setfilecon(file, udev->dev->kernel, stats.st_mode);
                        goto perms;
                }
+       } else {
+               selinux_setfscreatecon(file, udev->dev->kernel, mode);
+               retval = mknod(file, mode, devt);
+               selinux_resetfscreatecon();
+               if (retval == 0)
+                       goto perms;
        }
 
-       selinux_setfscreatecon(file, udev->dev->kernel, mode);
-       retval = mknod(file, mode, devt);
-       selinux_resetfscreatecon();
-       if (retval == 0)
-               goto perms;
-
        info("atomically replace '%s'", file);
        strlcpy(file_tmp, file, sizeof(file_tmp));
        strlcat(file_tmp, TMP_FILE_EXT, sizeof(file_tmp));
+       unlink(file_tmp);
        selinux_setfscreatecon(file_tmp, udev->dev->kernel, mode);
        retval = mknod(file_tmp, mode, devt);
        selinux_resetfscreatecon();
@@ -151,18 +151,19 @@ static int node_symlink(const char *node, const char *slink)
                                }
                        }
                }
+       } else {
+               info("creating symlink '%s' to '%s'", slink, target);
+               selinux_setfscreatecon(slink, NULL, S_IFLNK);
+               retval = symlink(target, slink);
+               selinux_resetfscreatecon();
+               if (retval == 0)
+                       goto exit;
        }
 
-       info("creating symlink '%s' to '%s'", slink, target);
-       selinux_setfscreatecon(slink, NULL, S_IFLNK);
-       retval = symlink(target, slink);
-       selinux_resetfscreatecon();
-       if (retval == 0)
-               goto exit;
-
        info("atomically replace '%s'", slink);
        strlcpy(slink_tmp, slink, sizeof(slink_tmp));
        strlcat(slink_tmp, TMP_FILE_EXT, sizeof(slink_tmp));
+       unlink(slink_tmp);
        selinux_setfscreatecon(slink_tmp, NULL, S_IFLNK);
        retval = symlink(target, slink_tmp);
        selinux_resetfscreatecon();