summaryrefslogtreecommitdiffstats
path: root/whiteout.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2004-04-16 01:58:08 +0000
committerJeremy Katz <katzj@redhat.com>2004-04-16 01:58:08 +0000
commitfc68b6d96044eb1cf1f945dc75fe5ab33f1a197f (patch)
tree9dc34f3ea8c52a8e8b19b428608a6d4c7219443f /whiteout.py
parent5e67f54f8c8b626149b403b86a277d5fb9ad5fbd (diff)
downloadanaconda-fc68b6d96044eb1cf1f945dc75fe5ab33f1a197f.tar.gz
anaconda-fc68b6d96044eb1cf1f945dc75fe5ab33f1a197f.tar.xz
anaconda-fc68b6d96044eb1cf1f945dc75fe5ab33f1a197f.zip
be explicit about what we're using for our file context path
Diffstat (limited to 'whiteout.py')
-rw-r--r--whiteout.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/whiteout.py b/whiteout.py
index 4e01963b1..dede8c663 100644
--- a/whiteout.py
+++ b/whiteout.py
@@ -18,11 +18,14 @@ if flags.selinux:
for fn in ("/tmp/updates/file_contexts",
"/mnt/source/RHupdates/file_contexts",
"/etc/security/selinux/src/policy/file_contexts/file_contexts",
- "/mnt/runtime/etc/security/selinux/file_contexts"):
+ "/mnt/runtime/etc/security/selinux/file_contexts",
+ "/etc/security/selinux/file_contexts"):
if os.access(fn, os.R_OK):
break
rpm.addMacro("__file_context_path", fn)
+ log("setting file_context_path to %s" %(fn,))
else:
+ log("setting file_context_path to nil")
rpm.addMacro("__file_context_path", "%{nil}")
whiteout="""