summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2007-01-24 18:20:19 +0000
committerJeremy Katz <katzj@redhat.com>2007-01-24 18:20:19 +0000
commit3d72af9a7c6cfedbd47b327074947ddd81afc9d2 (patch)
treed727b8530b9b84e79b60a4ada7d243312d9b685d
parent11e8e1bdc117b572697f30a0d85d8bd42a772196 (diff)
downloadanaconda-3d72af9a7c6cfedbd47b327074947ddd81afc9d2.tar.gz
anaconda-3d72af9a7c6cfedbd47b327074947ddd81afc9d2.tar.xz
anaconda-3d72af9a7c6cfedbd47b327074947ddd81afc9d2.zip
2007-01-24 Jeremy Katz <katzj@redhat.com>
* rescue.py (runRescue): Fix fsystem mounting * anaconda: Pass instClass
-rw-r--r--ChangeLog3
-rwxr-xr-xanaconda2
-rw-r--r--rescue.py3
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 35b7281cf..6ff9338e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-01-24 Jeremy Katz <katzj@redhat.com>
+ * rescue.py (runRescue): Fix fsystem mounting
+ * anaconda: Pass instClass
+
* anaconda (doStartupX11Actions): Setup graphical links earlier so
that we have the right theme bits
diff --git a/anaconda b/anaconda
index 21bbfacde..e28f0988a 100755
--- a/anaconda
+++ b/anaconda
@@ -692,7 +692,7 @@ if __name__ == "__main__":
iutil.makeCharDeviceNodes()
anaconda.id = instdata.InstallData(anaconda, [], "fd0", anaconda.methodstr, opts.display_mode)
- rescue.runRescue(anaconda)
+ rescue.runRescue(anaconda, instClass)
# shouldn't get back here
sys.exit(1)
diff --git a/rescue.py b/rescue.py
index d56011ed4..f58c7ffc2 100644
--- a/rescue.py
+++ b/rescue.py
@@ -185,7 +185,7 @@ def runShell(screen = None, msg=""):
if screen:
screen.finish()
-def runRescue(anaconda):
+def runRescue(anaconda, instClass):
for file in [ "services", "protocols", "group", "joe", "man.config",
"nsswitch.conf", "selinux", "mke2fs.conf" ]:
try:
@@ -269,6 +269,7 @@ def runRescue(anaconda):
screen = SnackScreen()
anaconda.intf = RescueInterface(screen)
+ anaconda.setMethod(instClass)
# prompt to see if we should try and find root filesystem and mount
# everything in /etc/fstab on that root