X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fselinux-setup.c;h=9ff27dcd77f03f0a1b7ab016d60deb3121b3e252;hb=7e2bb92dcae6ee785ff7462aadc8c369fd93715b;hp=e21ff6bb9fc9d14ca2416b5cda56172aa83b25ce;hpb=b925e72633bf98438f56a140520e07ec8c959e46;p=elogind.git

diff --git a/src/selinux-setup.c b/src/selinux-setup.c
index e21ff6bb9..9ff27dcd7 100644
--- a/src/selinux-setup.c
+++ b/src/selinux-setup.c
@@ -39,13 +39,14 @@ int selinux_setup(char *const argv[]) {
        int enforce = 0;
 
        /* Already initialized? */
-       if (path_is_mount_point("/selinux") > 0)
+       if (path_is_mount_point("/sys/fs/selinux") > 0 ||
+           path_is_mount_point("/selinux") > 0)
                return 0;
 
        /* Before we load the policy we create a flag file to ensure
-        * that after the reexec we iterate through /dev to relabel
-        * things. */
-       touch("/dev/.systemd-relabel-devtmpfs");
+        * that after the reexec we iterate through /run and /dev to
+        * relabel things. */
+       touch("/dev/.systemd-relabel-run-dev");
 
        if (selinux_init_load_policy(&enforce) == 0) {
                log_debug("Successfully loaded SELinux policy, reexecuting.");
@@ -60,7 +61,7 @@ int selinux_setup(char *const argv[]) {
        } else {
                log_full(enforce > 0 ? LOG_ERR : LOG_WARNING, "Failed to load SELinux policy.");
 
-               unlink("/dev/.systemd-relabel-devtmpfs");
+               unlink("/dev/.systemd-relabel-run-dev");
 
                if (enforce > 0)
                        return -EIO;