Purpose: Try to fix the logic used to enable SELinux

Authour: Petter Reinholdtsen

Fixes:   #580272

Status:  Not sent upstream yet

--- sysvinit/src/init.c

+++ sysvinit/src/init.c

@@ -54,10 +54,6 @@

 #ifdef WITH_SELINUX

 #  include <selinux/selinux.h>

-#  include <sys/mount.h>

-#  ifndef MNT_DETACH /* present in glibc 2.10, missing in 2.7 */

-#    define MNT_DETACH 2

-#  endif

 #endif

 #ifdef __i386__

@@ -2870,11 +2866,9 @@ int main(int argc, char **argv)

 #ifdef WITH_SELINUX

 	if (getenv("SELINUX_INIT") == NULL) {

-	  const int rc = mount("proc", "/proc", "proc", 0, 0);

-	  if (is_selinux_enabled() > 0) {

-	    putenv("SELINUX_INIT=YES");

-	    if (rc == 0) umount2("/proc", MNT_DETACH);

+	  if (is_selinux_enabled() != 1) {

 	    if (selinux_init_load_policy(&enforce) == 0) {

+	      putenv("SELINUX_INIT=YES");

 	      execv(myname, argv);

 	    } else {

 	      if (enforce > 0) {

@@ -2885,7 +2879,6 @@ int main(int argc, char **argv)

 	      }

 	    }

 	  }

-	  if (rc == 0) umount2("/proc", MNT_DETACH);

 	}

 #endif  

 	/* Start booting. */