cdrom_id: replace with version which also exports media properties

[elogind.git] / udev_node.c

diff --git a/udev_node.c b/udev_node.c
index c620e4aa0b13f95b676cb95401e9216235aff291..6ca0601ea48e815b86437e75819611008e715211 100644 (file)
--- a/udev_node.c
+++ b/udev_node.c
@@ -164,7 +164,7 @@ static int node_symlink(const char *node, const char *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);
+       selinux_setfscreatecon(slink, NULL, S_IFLNK);
        retval = symlink(target, slink_tmp);
        selinux_resetfscreatecon();
        if (retval != 0) {
@@ -408,8 +408,8 @@ int udev_node_remove(struct udevice *udev)
        strlcat(filename, "/", sizeof(filename));
        strlcat(filename, udev->name, sizeof(filename));
        if (stat(filename, &stats) != 0) {
-               dbg("device node '%s' not found", filename);
-               return -1;
+               info("device node '%s' not found", filename);
+               return 0;
        }
        if (udev->devt && stats.st_rdev != udev->devt) {
                info("device node '%s' points to a different device, skip removal", filename);