Attachment 148355 Details for Bug 209015 – [RHEL4] fix rescue mode traceback

[patch] [RHEL4] fix rescue mode traceback

bz193285.patch (text/plain), 2.22 KB, created by David Lehman on 2007-02-19 18:46:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Lehman

Created: 2007-02-19 18:46:40 UTC

Size: 2.22 KB

patch

obsolete

>--- rescue.py	24 Apr 2006 20:48:25 -0000	1.59.2.3
>+++ rescue.py	27 Jun 2006 18:22:54 -0000	1.59.2.4
>@@ -162,14 +162,23 @@
> 
>         f.close()
> 
>-def runShell():
>-    shpid = os.fork()
>-    if shpid == 0:
>-        os.setsid()
>-        fcntl.ioctl(0, termios.TIOCSCTTY)
>-        os.execv("/bin/sh", ["-/bin/sh"])
>+def runShell(screen, msg=""):
>+    screen.suspend()
>+
>+    print
>+    if msg:
>+        print (msg)
>+    print _("When finished please exit from the shell and your "
>+            "system will reboot.")
>+    print
>+
>+    if os.path.exists("/bin/sh"):
>+        iutil.execWithRedirect("/bin/sh", ["-/bin/sh"])
>     else:
>-        os.waitpid(shpid, 0)
>+        print "Unable to find /bin/sh to execute!  Not starting shell"
>+        time.sleep(5)
>+
>+    screen.finish()
>    
> def runRescue(instPath, mountroot, id):
> 
>@@ -249,11 +258,7 @@
> 	screen.finish()
> 
>     if (not mountroot):
>-        print
>-        print _("When finished please exit from the shell and your "
>-                "system will reboot.")
>-        print
>-	runShell()
>+	runShell(screen)
> 	sys.exit(0)
> 
>     # lets create some devices
>@@ -283,12 +288,8 @@
>           [_("Continue"), _("Read-Only"), _("Skip")] )
> 
>     if rc == string.lower(_("Skip")):
>-        screen.finish()
>-        print
>-        print _("When finished please exit from the shell and your "
>-                "system will reboot.")
>-        print
>-        runShell()
>+        runShell(screen)
>+        sys.exit(0)
>     elif rc == string.lower(_("Read-Only")):
>         readOnly = 1
>     else:
>@@ -433,20 +434,15 @@
> 			     "automatically when you exit from the shell."),
> 			   [ _("OK") ], width = 50)
> 
>-    screen.finish()
>+    msgStr = ""
> 
>-    print
>     if rootmounted and not readOnly:
>         makeMtab(instPath, fs)
>         try:
>             makeResolvConf(instPath)
>         except Exception, e:
>             log("error making a resolv.conf: %s" %(e,))
>-        print _("Your system is mounted under the %s directory.") % (instPath,)
>-        print
>+        msgStr = _("Your system is mounted under the %s directory.") % (instPath,)
> 
>-    print _("When finished please exit from the shell and your "
>-                "system will reboot.")
>-    print
>-    runShell()
>+    runShell(screen, msgStr)
>     sys.exit(0)
>

Actions: View | Diff

Attachments on bug 209015: 148355 | 148407