summaryrefslogtreecommitdiffstats
path: root/xserver.py
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>1999-11-10 20:38:52 +0000
committerMatt Wilson <msw@redhat.com>1999-11-10 20:38:52 +0000
commit26f5d9c3ddcedafd374fb8c1e0ab1177d449a9da (patch)
tree1bb8d3753b79e412326a6b6793df9ce7f03fbfc3 /xserver.py
parentd6d4e92451e4330cfe67c1ea59867c97d4d54d31 (diff)
downloadanaconda-26f5d9c3ddcedafd374fb8c1e0ab1177d449a9da.tar.gz
anaconda-26f5d9c3ddcedafd374fb8c1e0ab1177d449a9da.tar.xz
anaconda-26f5d9c3ddcedafd374fb8c1e0ab1177d449a9da.zip
fix from erik to try to keep the ultra from hanging on reboot
Diffstat (limited to 'xserver.py')
-rw-r--r--xserver.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/xserver.py b/xserver.py
index c53b12d3d..3ff5c8f70 100644
--- a/xserver.py
+++ b/xserver.py
@@ -203,6 +203,12 @@ EndSection
pid, status = os.waitpid(child, 0)
except:
sys.exit (-1)
+ try:
+ sys.kill(server, 15)
+ pid, status = os.waitpid(server, 0)
+ except:
+ sys.exit(-1)
+
sys.exit((status >> 8) & 0xf)
return ((mouseProtocol, mouseEmulate, mouseDev), x)