2007-04-13 Jeremy Katz <katzj@redhat.com>

	* livecd.py (LiveCDCopyBackend._doFilesystemMangling): Fix
	restorecon to do the right thing; we were ending up with files
	starting with // and then files were mis-labeled (#236282)

1 files changed, 3 insertions, 3 deletions

diff --git a/livecd.py b/livecd.py
index 76577d58c..44306e106 100644
--- a/livecd.py
+++ b/livecd.py
@@ -212,10 +212,10 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
             wait.refresh()
             # XXX: we should be preserving contexts on our copy, but
             # this will do for now
-            for dir, subdirs, files in os.walk("%s/%s" %(anaconda.rootPath, tocopy)):
+            for dir, subdirs, files in os.walk(os.path.normpath("%s/%s" %(anaconda.rootPath, tocopy))):
                 dir = dir[len(anaconda.rootPath):]
-                for f in map(lambda x: "%s/%s" %(dir, x), files):
-                    if not os.access(f, os.R_OK):
+                for f in map(lambda x: "%s/%s" %(dir, x), files) + [dir]:
+                    if not os.access("%s/%s" %(anaconda.rootPath, f), os.R_OK):
                         continue
                     ret = isys.resetFileContext(os.path.normpath(f),
                                                 anaconda.rootPath)