diff options
| author | Matt Wilson <msw@redhat.com> | 1999-09-22 06:08:21 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-09-22 06:08:21 +0000 |
| commit | a5a190c37d15fa8ab0358c75ee3c19eff9eab3af (patch) | |
| tree | 5f06da39e2dd4cf31028b99e93ac967179b4bc2d /xserver.py | |
| parent | 3bf44a446bf6183f644ce864f17586716939db49 (diff) | |
| download | anaconda-a5a190c37d15fa8ab0358c75ee3c19eff9eab3af.tar.gz anaconda-a5a190c37d15fa8ab0358c75ee3c19eff9eab3af.tar.xz anaconda-a5a190c37d15fa8ab0358c75ee3c19eff9eab3af.zip | |
merge from jj
Diffstat (limited to 'xserver.py')
| -rw-r--r-- | xserver.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/xserver.py b/xserver.py index 1acec62d4..6ad62acbb 100644 --- a/xserver.py +++ b/xserver.py @@ -34,7 +34,7 @@ def startX(): except: pass elif mouseDev == 'sunmouse': - mousePrototol = "Sun" + mouseProtocol = "sun" mouseEmulate = 0 else: mouseProtocol = "Microsoft" @@ -106,16 +106,20 @@ EndSection server = os.fork() if (not server): print "starting", serverPath + args = [serverPath, ':1', 'vt7'] if serverPath[0:19] == '/usr/X11R6/bin/Xsun': try: os.unlink("/dev/mouse") except: pass os.symlink(mouseDev, "/dev/mouse") - os.execv(serverPath, [serverPath, 'vt7', '-dev', '/dev/' + x.device]) + if x.device: + args.append ("-dev") + args.append ('/dev/' + x.device) else: - os.execv(serverPath, [serverPath, ':1', '-xf86config', - '/tmp/XF86Config', 'vt7']) + args.append("-xf86config") + args.append("/tmp/XF86Config") + os.execv(serverPath, args) # give time for the server to fail (if it is going to fail...) time.sleep (1) |