use "change" instead of "online" events

[elogind.git] / udev_selinux.c

diff --git a/udev_selinux.c b/udev_selinux.c
index f014ea55359d6653950a419fd33827dff76e2cf9..446fedc3c35aa67c47e724cb820f357d69d61196 100644 (file)
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -30,8 +30,8 @@
 #include <errno.h>
 #include <selinux/selinux.h>
 
+#include "udev.h"
 #include "udev_selinux.h"
-#include "logging.h"
 
 static security_context_t prev_scontext = NULL;
 
@@ -54,7 +54,7 @@ static char *get_media(const char *devname, int mode)
        int size;
        char *media = NULL;
 
-       if (!(mode && S_IFBLK))
+       if (!(mode & S_IFBLK))
                return NULL;
 
        snprintf(procfile, PATH_MAX, "/proc/ide/%s/media", devname);
@@ -152,7 +152,7 @@ void selinux_init(void)
         * restoration creation purposes.
         */
        if (is_selinux_running()) {
-               matchpathcon_init_prefix(NULL, "/dev");
+               matchpathcon_init_prefix(NULL, udev_root);
                if (getfscreatecon(&prev_scontext) < 0) {
                        err("getfscreatecon failed\n");
                        prev_scontext = NULL;