summaryrefslogtreecommitdiffstats
path: root/whiteout.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2004-06-09 17:46:43 +0000
committerJeremy Katz <katzj@redhat.com>2004-06-09 17:46:43 +0000
commit11935573c55dcc80a922341fcf74226a9611deaa (patch)
tree4d4ee8581a494ac9edeb5acaa2aa33180b9395c9 /whiteout.py
parentce4670a6f461a4439333eabcd1dface1e2a3ba3c (diff)
downloadanaconda-11935573c55dcc80a922341fcf74226a9611deaa.tar.gz
anaconda-11935573c55dcc80a922341fcf74226a9611deaa.tar.xz
anaconda-11935573c55dcc80a922341fcf74226a9611deaa.zip
targeted policy updates, a few little simplifications
Diffstat (limited to 'whiteout.py')
-rw-r--r--whiteout.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/whiteout.py b/whiteout.py
index 71f8dd3bc..91259a73a 100644
--- a/whiteout.py
+++ b/whiteout.py
@@ -16,10 +16,11 @@ rpm.addMacro("__dbi_cdb", "create private mpool mp_mmapsize=16Mb mp_size=1Mb")
# assuming that SELinux is set up, tell rpm where to pull file contexts from
if flags.selinux:
- for fn in ("/tmp/updates/file_contexts",
- "/mnt/source/RHupdates/file_contexts",
- "/etc/security/selinux/src/policy/file_contexts/file_contexts",
- "/etc/security/selinux/file_contexts"):
+ for dir in ("/tmp/updates", "/mnt/source/RHupdates",
+ "/etc/selinux/targeted/contexts/files",
+ "/etc/security/selinux/src/policy/file_contexts",
+ "/etc/security/selinux"):
+ fn = "%s/file_contexts" %(dir,)
if os.access(fn, os.R_OK):
break
rpm.addMacro("__file_context_path", fn)