2005-04-27 Jeremy Katz <katzj@redhat.com>

	* installmethod.py (doMethodComplete): Figure out rootfs better
	* dispatch.py (installSteps): Pass id.fsset to methodcomplete.

3 files changed, 10 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index ebec3e335..0cfc48225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-27  Jeremy Katz  <katzj@redhat.com>
+
+	* installmethod.py (doMethodComplete): Figure out rootfs better
+	* dispatch.py (installSteps): Pass id.fsset to methodcomplete.
+
 2005-04-27  Peter Jones  <pjones@redhat.com>
 
 	* installmethod.py (doMethodComplete): write a minimal mtab when
diff --git a/dispatch.py b/dispatch.py
index f203326bc..e372d5e4a 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -157,7 +157,7 @@ installSteps = [
     ("setfilecon", setFileCons, ("instPath","id.partitions")),
     ("copylogs", copyAnacondaLogs, ("instPath",)),
     ("dopostaction", doPostAction, ("id", "instPath", "intf")),
-    ("methodcomplete", doMethodComplete, ("method",)),
+    ("methodcomplete", doMethodComplete, ("method", "id.fsset")),
     ("complete", ()),
     ]
 
diff --git a/installmethod.py b/installmethod.py
index f6935c5ae..f2b153598 100644
--- a/installmethod.py
+++ b/installmethod.py
@@ -119,18 +119,13 @@ class InstallMethod:
 # this handles any cleanup needed for the method.  it occurs *very* late
 # (ie immediately before the congratulations screen).  main use right now
 # is ejecting the cdrom
-def doMethodComplete(method):
+def doMethodComplete(method, fsset):
     method.ejectCD()
 
-    f = open(method.rootPath + "/etc/mtab", "r")
-    lines = f.readlines()
-    f.close()
-
     mtab = "/dev/root / ext3 ro 0 0\n"
-    for line in lines:
-        values = line.split()
-        if values[1] == '/':
-            mtab = "/dev/root / %s ro 0 0\n" % (values[2],)
+    for ent in fsset.entries:
+        if ent.mountpoint == "/":
+            mtab = "/dev/root / %s ro 0 0\n" %(ent.fsystem.name,)
     
     f = open(method.rootPath + "/etc/mtab", "w+")
     f.write(mtab)