098 release

[elogind.git] / udev_node.c

diff --git a/udev_node.c b/udev_node.c
index ee59d4ae7c74b0642a37d391a97d58005f26b285..4ba1c26c5e014d26fa9fc49e1d0bbc420ebd19c5 100644 (file)
--- a/udev_node.c
+++ b/udev_node.c
@@ -51,7 +51,7 @@ int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t m
        /* preserve node with already correct numbers, to prevent changing the inode number */
        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_name, stats.st_mode);
+               selinux_setfilecon(file, udev->dev->kernel, stats.st_mode);
                goto perms;
        }
 
@@ -61,7 +61,7 @@ int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t m
                dbg("already present file '%s' unlinked", file);
 
 create:
-       selinux_setfscreatecon(file, udev->dev->kernel_name, mode);
+       selinux_setfscreatecon(file, udev->dev->kernel, mode);
        retval = mknod(file, mode, devt);
        selinux_resetfscreatecon();
        if (retval != 0) {
@@ -130,8 +130,6 @@ int udev_node_add(struct udevice *udev, struct udevice *udev_old)
        int i;
        int retval = 0;
 
-       selinux_init();
-
        snprintf(filename, sizeof(filename), "%s/%s", udev_root, udev->name);
        filename[sizeof(filename)-1] = '\0';