use udev_root instead of "/dev"in selinux matchpathcon_init_prefix()

[elogind.git] / udev_selinux.c

diff --git a/udev_selinux.c b/udev_selinux.c
index 719ff6403ec178d15e412d0e9cc872e46274328e..1e1fdb961794409ed3f3d4be13e56ee9a4d86458 100644 (file)
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -100,12 +100,12 @@ void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
 
                if (ret < 0)
                        if (matchpathcon(file, mode, &scontext) < 0) {
-                               dbg("matchpathcon(%s) failed\n", file);
+                               err("matchpathcon(%s) failed\n", file);
                                return;
                        } 
 
                if (setfilecon(file, scontext) < 0)
-                       dbg("setfilecon %s failed: %s", file, strerror(errno));
+                       err("setfilecon %s failed: %s", file, strerror(errno));
 
                freecon(scontext);
        }
@@ -126,12 +126,12 @@ void selinux_setfscreatecon(const char *file, const char *devname, unsigned int
 
                if (ret < 0)
                        if (matchpathcon(file, mode, &scontext) < 0) {
-                               dbg("matchpathcon(%s) failed\n", file);
+                               err("matchpathcon(%s) failed\n", file);
                                return;
                        }
 
                if (setfscreatecon(scontext) < 0)
-                       dbg("setfscreatecon %s failed: %s", file, strerror(errno));
+                       err("setfscreatecon %s failed: %s", file, strerror(errno));
 
                freecon(scontext);
        }
@@ -141,7 +141,7 @@ void selinux_resetfscreatecon(void)
 {
        if (is_selinux_running()) {
                if (setfscreatecon(prev_scontext) < 0)
-                       dbg("setfscreatecon failed: %s", strerror(errno));
+                       err("setfscreatecon failed: %s", strerror(errno));
        }
 }
 
@@ -152,8 +152,9 @@ void selinux_init(void)
         * restoration creation purposes.
         */
        if (is_selinux_running()) {
+               matchpathcon_init_prefix(NULL, udev_root);
                if (getfscreatecon(&prev_scontext) < 0) {
-                       dbg("getfscreatecon failed\n");
+                       err("getfscreatecon failed\n");
                        prev_scontext = NULL;
                }
        }