From: František Dvořák <valtri@civ.zcu.cz>
Date: Sun, 4 Nov 2012 01:02:19 +0000 (+0000)
Subject: Use system_r SELinux context (known to SL5 too).
X-Git-Tag: glite-jobid-api-c_R_2_2_4_1~9
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8e5b3681d57e6adc64473947682fba7d32e67eea;p=jra1mw.git

Use system_r SELinux context (known to SL5 too).
---

diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
index 4eb494c..e7ce071 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
@@ -46,7 +46,7 @@ echo "Output format:    \$OUTPUT_OPT "
 
 export GSTSTCOLS CVSROOT
 
-${INSTALLCMD} voms-clients curl wget lsof $INSTALLPKGS
+${INSTALLCMD} voms-clients curl wget lsof sudo $INSTALLPKGS
 
 if test -f /usr/sbin/apache2; then
 	SYS_APACHE=apache2
@@ -109,8 +109,8 @@ if selinuxenabled >/dev/null 2>&1; then
 	# SL6 doesn't like much starting apache inside rc scripts
 	# change identity 'system_u:system_r:initrc_t:s0'
 	echo "SELinux enabled, don't panic!"
-	echo Starting sudo -r unconfined_r -t unconfined_t \$SYS_APACHE -f \$HTTPD_CONF
-	sudo -r unconfined_r -t unconfined_t \$SYS_APACHE -f \$HTTPD_CONF
+	echo Starting sudo -r system_r -t unconfined_t \$SYS_APACHE -f \$HTTPD_CONF
+	sudo -r system_r -t unconfined_t \$SYS_APACHE -f \$HTTPD_CONF
 else
 	echo Starting \$SYS_APACHE -f \$HTTPD_CONF
 	\$SYS_APACHE -f \$HTTPD_CONF