merge from (now defunct) anaconda-dispatch branch

1 files changed, 14 insertions, 12 deletions

diff --git a/rescue.py b/rescue.py
index 7758125c7..f16b492f3 100644
--- a/rescue.py
+++ b/rescue.py
@@ -2,9 +2,7 @@ import upgrade
 from snack import *
 from text import WaitWindow, OkCancelWindow
 from translate import _
-import _balkan
 import sys
-import raid
 import os
 from log import log
 import isys
@@ -26,25 +24,29 @@ class RescueInterface:
 
 def runRescue(url, serial, mountroot):
 
-    from fstab import NewtFstab
+#
+# XXX - disabling mounting of existing installations
+#
+#    from fstab import NewtFstab
 
     fstab = None
 
-    log.open (serial, 0, 0, 1)
-
     for file in [ "services", "protocols", "group" ]:
        os.symlink('/mnt/runtime/etc/' + file, '/etc/' + file)
 
     if (not mountroot):
 	os.execv("/bin/sh", [ "-/bin/sh" ])
 
-    try:
-	fstab = NewtFstab(1, serial, 0, 0, None, None, None, 0, [], 0, 0,
-			  requireBlockDevices = 0)
-    except SystemError, text:
-	print _("WARNING: no valid block devices were found.\n")
-    except:
-	print _("ERROR: unknown error encountered reading partition tables.\n")
+#
+# XXX - disabling mounting of existing installations
+#
+#    try:
+#	fstab = NewtFstab(1, serial, 0, 0, None, None, None, 0, [], 0, 0,
+#			  requireBlockDevices = 0)
+#    except SystemError, text:
+#	print _("WARNING: no valid block devices were found.\n")
+#    except:
+#	print _("ERROR: unknown error encountered reading partition tables.\n")
 	
     if not fstab:
 	os.execv("/bin/sh", [ "-/bin/sh" ])