[PATCH] Do not traceback at the very beginning of rescue mode

[Martin Sivak <msivak@xxxxxxxxxx>]

---
 anaconda  |    9 +++++++++
 rescue.py |    6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/anaconda b/anaconda
index a4ed591..3bbf0fe 100755
--- a/anaconda
+++ b/anaconda
@@ -778,8 +778,17 @@ if __name__ == "__main__":
         if opts.ksfile:
             anaconda.isKickstart = True
             instClass.setInstallData(anaconda)
+
+            #we need waitWindow valid in processKickstartFile. because storage uses it
+            from snack import *
+            screen = SnackScreen()
+            anaconda.intf = rescue.RescueInterface(screen)
+
             kickstart.processKickstartFile(anaconda, opts.ksfile)
 
+            anaconda.intf = None
+            screen.finish()
+
             # command line 'nomount' overrides kickstart /same for vnc/
             anaconda.rescue_mount = not (opts.rescue_nomount or anaconda.id.ksdata.rescue.nomount)
 
diff --git a/rescue.py b/rescue.py
index aeceb98..688266f 100644
--- a/rescue.py
+++ b/rescue.py
@@ -223,15 +223,15 @@ def runRescue(anaconda, instClass):
 
         sys.exit(0)
 
+    screen = SnackScreen()
+    anaconda.intf = RescueInterface(screen)
+
     if anaconda.isKickstart:
         if anaconda.id.ksdata.rescue and anaconda.id.ksdata.rescue.romount:
             readOnly = 1
         else:
             readOnly = 0
     else:
-        screen = SnackScreen()
-        anaconda.intf = RescueInterface(screen)
-
         # prompt to see if we should try and find root filesystem and mount
         # everything in /etc/fstab on that root
         rc = ButtonChoiceWindow(screen, _("Rescue"),
-- 
1.5.4.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list