Don't specify a stdout or stderr for shells on s390 (#210481).

4 files changed, 18 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 794705b68..ed7831363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,11 @@
 	changes when going back to the parttype screen (#211255).
 	* textw/partition_text.py (PartitionWindow.__call__):  Likewise.
 
+	* anaconda (runVNC):  Don't specify a stdout or stderr for shells on
+	s390 (#210481).
+	* rescue.py (runShell):  Likewise.
+	* text.py (spawShell):  Likewise.
+
 2006-10-18  David Cantrell  <dcantrell@redhat.com>
 
 	* anaconda (parseOptions): Add the --noipv4 and --noipv6 opts (#208334).
diff --git a/anaconda b/anaconda
index 6881e4981..6dc22b0bf 100755
--- a/anaconda
+++ b/anaconda
@@ -426,7 +426,10 @@ def runVNC(vncpassword, vncconnecthost, vncconnectport, vncStartedCB=None):
 		    if os.access(p, os.R_OK|os.X_OK):
 			os.environ['PYTHONSTARTUP'] = p
 			break
-                iutil.execWithRedirect("/bin/sh", [], stdout="/dev/console", stderr="/dev/console")
+                if rhpl.getArch() == "s390":
+                    iutil.execWithRedirect("/bin/sh", [])
+                else:
+                    iutil.execWithRedirect("/bin/sh", [], stdout="/dev/console", stderr="/dev/console")
 	    else:
 	        addpid(shpid)
 	        os.waitpid(shpid, 0)
diff --git a/rescue.py b/rescue.py
index c3517f67a..cd9c54302 100644
--- a/rescue.py
+++ b/rescue.py
@@ -28,6 +28,7 @@ import shutil
 import fcntl
 import termios
 
+import rhpl
 from rhpl.translate import _
 
 import logging
@@ -177,7 +178,10 @@ def runShell(screen = None, msg=""):
     print
 
     if os.path.exists("/bin/sh"):
-        iutil.execWithRedirect("/bin/sh", [], stdout="/dev/console", stderr="/dev/console")
+        if rhpl.getArch() == "s390":
+            iutil.execWithRedirect("/bin/sh", [])
+        else:
+            iutil.execWithRedirect("/bin/sh", [], stdout="/dev/console", stderr="/dev/console")
     else:
         print "Unable to find /bin/sh to execute!  Not starting shell"
         time.sleep(5)
diff --git a/text.py b/text.py
index a57e08176..160fa3990 100644
--- a/text.py
+++ b/text.py
@@ -560,7 +560,10 @@ def spawnShell(screen):
     screen.suspend()
     print "\n\nType <exit> to return to the install program.\n"
     if os.path.exists("/bin/sh"):
-        iutil.execWithRedirect("/bin/sh", [], stdout="/dev/console", stderr="/dev/console")
+        if rhpl.getArch() == "s390":
+            iutil.execWithRedirect("/bin/sh", [])
+        else:
+            iutil.execWithRedirect("/bin/sh", [], stdout="/dev/console", stderr="/dev/console")
     else:
         print "Unable to find /bin/sh to execute!  Not starting shell"
     time.sleep(5)