36 lines
960 B
Diff
36 lines
960 B
Diff
|
--- src/init.c
|
||
|
|
+++ src/init.c 2010-05-17 09:32:29.958932802 +0000
|
||
|
|
@@ -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__
|
||
|
|
@@ -2886,11 +2882,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) {
|
||
|
|
@@ -2901,7 +2895,6 @@ int main(int argc, char **argv)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
- if (rc == 0) umount2("/proc", MNT_DETACH);
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
/* Start booting. */
|