[Initng-svn] r4078 - in initng/trunk/plugins: .

[svn at initng.thinktux.net]

Author: dragoran
Date: Mon May  8 19:14:03 2006
New Revision: 4078

Modified:
   initng/trunk/plugins/CMakeLists.txt
   initng/trunk/plugins/bash_launcher/CMakeLists.txt

Log:
Comment selinux and sepol from bash_launcher for now; but I doubt that this will work because the context code needs to be called *before* execve in bash_launcher

Modified: initng/trunk/plugins/CMakeLists.txt
==============================================================================
--- initng/trunk/plugins/CMakeLists.txt	(original)
+++ initng/trunk/plugins/CMakeLists.txt	Mon May  8 19:14:03 2006
@@ -1,9 +1,5 @@
 SUBDIRS( service daemon runlevel ) 
 
-IF(BUILD_SELINUX)
-	ADD_SUBDIRECTORY( selinux )
-ENDIF(BUILD_SELINUX)
-
 IF(BUILD_ALSO)
 	ADD_SUBDIRECTORY( also )
 ENDIF(BUILD_ALSO)
@@ -132,6 +128,10 @@
 	ADD_SUBDIRECTORY( rlparser )
 ENDIF(BUILD_RLPARSER)
 
+IF(BUILD_SELINUX)
+	ADD_SUBDIRECTORY( selinux )
+ENDIF(BUILD_SELINUX)
+
 IF(BUILD_SIMPLE_LAUNCHER)
 	ADD_SUBDIRECTORY( simple_launcher )
 ENDIF(BUILD_SIMPLE_LAUNCHER)

Modified: initng/trunk/plugins/bash_launcher/CMakeLists.txt
==============================================================================
--- initng/trunk/plugins/bash_launcher/CMakeLists.txt	(original)
+++ initng/trunk/plugins/bash_launcher/CMakeLists.txt	Mon May  8 19:14:03 2006
@@ -2,9 +2,9 @@
 
 ADD_LIBRARY(bashlaunch MODULE initng_bash_launcher.c)
 TARGET_LINK_LIBRARIES(bashlaunch initng)
-IF(SELINUX OR OLDSELINUX)
-	TARGET_LINK_LIBRARIES(bashlaunch selinux sepol)
-ENDIF(SELINUX OR OLDSELINUX)
+#IF(SELINUX OR OLDSELINUX)
+#	TARGET_LINK_LIBRARIES(bashlaunch selinux sepol)
+#ENDIF(SELINUX OR OLDSELINUX)
 
 IF (WITH_BUSYBOX)
 	ADD_DEFINITIONS(-DWITH_BUSYBOX)