rpms/mrepo/devel mrepo-selinux.patch,NONE,1.1

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/mrepo/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24678

Added Files:
	mrepo-selinux.patch 
Log Message:
Patch to get ISO mounting working under SELinux (#589755).

mrepo-selinux.patch:
 mrepo |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE mrepo-selinux.patch ---
diff -up mrepo-0.8.6/mrepo.orig mrepo-0.8.6/mrepo
--- mrepo-0.8.6/mrepo.orig	2008-10-06 23:46:37.000000000 +0300
+++ mrepo-0.8.6/mrepo	2010-05-10 23:55:45.121368657 +0300
@@ -18,6 +18,7 @@ from __future__ import generators # for 
 import os, sys, glob, re, shutil, getopt, popen2
 import ConfigParser, urlparse, sha, types, traceback
 import time
+import selinux
 
 __version__ = "$Revision: 6444 $"
 # $Source$
@@ -517,8 +518,8 @@ class Dist:
             opts = '-o loop,ro'
             extra_opts = ''
             mount_cmd = cf.cmd['mount']
-            if readfile('/selinux/enforce') == '1':
-                opts = opts + ',context=system_u:object_r:httpd_sys_content_t'
+            if selinux.is_selinux_enabled()  == '1':
+                opts = opts + ',context=system_u:object_r:httpd_sys_content_t:s0'
         for iso in self.isos:
             if cf.shareiso:
                 symlink(iso, os.path.join(self.dir, 'iso'))