[Fedora-livecd-list] imgcreate/kickstart.py

[Bruno Wolff III]

 imgcreate/kickstart.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 38329161626c5451bbe671786ebf006d9d83bf78
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Sep 26 22:54:36 2010 -0500

    setfiles parameter list fix for relabelling.
    
    The patch to handle labelling on a live image when the compose host has
    selinux disabled had the context spec file in the wrong place. It should
    be after options.

diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index aa2cff0..9a2145a 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -420,7 +420,7 @@ class SelinuxConfig(KickstartConfig):
         if not os.path.exists(self.path("/sbin/setfiles")):
             return
 
-        self.call(["/sbin/setfiles", "/etc/selinux/targeted/contexts/files/file_contexts", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/selinux", "/"])
+        self.call(["/sbin/setfiles", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/selinux", "/etc/selinux/targeted/contexts/files/file_contexts", "/"])
 
     def apply(self, ksselinux):
         if os.path.exists(self.path("/usr/sbin/lokkit")):