add /dev/rtc symlink if new rtc drivers are used

[elogind.git] / udev_node.c

diff --git a/udev_node.c b/udev_node.c
index 9e09e58ba8d574df0d9fd8ac1cfb1454ea4979dc..25eed86935978af1d6e9141eacdd50edf3ea6eb3 100644 (file)
--- a/udev_node.c
+++ b/udev_node.c
@@ -63,6 +63,7 @@ int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t m
        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();
@@ -132,7 +133,7 @@ static int node_symlink(const char *node, const char *slink)
                                    stats.st_rdev == stats2.st_rdev) {
                                        info("replace device node '%s' with symlink to our node '%s'", slink, node);
                                } else {
-                                       err("device node '%s' already exists, link '%s' will not overwrite it", node, slink);
+                                       err("device node '%s' already exists, link to '%s' will not overwrite it", slink, node);
                                        goto exit;
                                }
                        }
@@ -162,6 +163,7 @@ static int node_symlink(const char *node, const char *slink)
        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();