* rescue.py (runRescue): fix selinux mount in rescue mode (#234137)

	* loader2/module-info: add stex (#230214)

3 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 79119505d..50ccdf79c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-27  Dave Lehman  <dlehman@redhat.com>
+
+	* rescue.py (runRescue): fix selinux mount in rescue mode (#234137)
+
+	* loader2/module-info: add stex (#230214)
+
 2007-03-08  Chris Lumens  <clumens@redhat.com>
 
 	* partedUtils.py (DiskSet.openDevices):  Ignore disks listed in
diff --git a/loader2/module-info b/loader2/module-info
index a9feba3f7..a244907de 100644
--- a/loader2/module-info
+++ b/loader2/module-info
@@ -850,6 +850,10 @@ siimage
         scsi_hostadapter
         "Silicon Image SATA controllers"
 
+stex
+	scsi_hostadapter
+	"Promise SuperTrak EX"
+
 sx8
 	scsi_hostadapter
 	"Promise SATA SX8 block driver"
diff --git a/rescue.py b/rescue.py
index da25a63da..4ce5489bd 100644
--- a/rescue.py
+++ b/rescue.py
@@ -18,6 +18,7 @@ import upgrade
 from snack import *
 from constants_text import *
 from text import WaitWindow, OkCancelWindow, ProgressWindow, stepToClasses
+from flags import flags
 import sys
 import os
 import isys
@@ -368,9 +369,9 @@ def runRescue(instPath, mountroot, id):
                 isys.mount("/dev", "/mnt/sysimage/dev", bindMount = 1)
 
                 # and /selinux too
-                if flags.selinux and os.path.isdir("%s/selinux" %(anaconda.rootPath,)):
+                if flags.selinux and os.path.isdir("%s/selinux" %(instPath,)):
                     try:
-                        isys.mount("/selinux", "%s/selinux" %(anaconda.rootPath,),         
+                        isys.mount("/selinux", "%s/selinux" %(instPath,),
                                    "selinuxfs")
                     except Exception, e:
                         log.error("error mounting selinuxfs: %s" %(e,))