[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[rhel6-branch][PATCH] Catch exception when returning tty control to init on s390(x)



Resolves: rhbz#747219

This patch fixes the problem on s390(x) where we cannot return the tty to init's control.
We don't need to do that there because there is no prompt to hit Ctrl+C on s390(x), so
simple pass should be ok.

---
 anaconda |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/anaconda b/anaconda
index 170bc3f..b17d0e5 100755
--- a/anaconda
+++ b/anaconda
@@ -39,7 +39,11 @@ wm_pid = None
 xserver_pid = None
 
 def return_tty(fd, pgrp_id):
-    os.tcsetpgrp(fd, pgrp_id)
+    try:
+        os.tcsetpgrp(fd, pgrp_id)
+    except OSError as oserr:
+        #fails on s390 and s390x where we don't need it
+        pass
 
 # Make sure messages sent through python's warnings module get logged.
 def AnacondaShowWarning(message, category, filename, lineno, file=sys.stderr, line=None):
-- 
1.7.4.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]