summaryrefslogtreecommitdiffstats
path: root/todo.py
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2000-06-19 17:30:13 +0000
committerMatt Wilson <msw@redhat.com>2000-06-19 17:30:13 +0000
commit99bb1dd29e024a645122ab162ab2a0130285f97a (patch)
tree9a521c0ee574ad483a0e413f8aaf6871fa717660 /todo.py
parent25cb3c1608e2521196048f77f0da75959c16f881 (diff)
downloadanaconda-99bb1dd29e024a645122ab162ab2a0130285f97a.tar.gz
anaconda-99bb1dd29e024a645122ab162ab2a0130285f97a.tar.xz
anaconda-99bb1dd29e024a645122ab162ab2a0130285f97a.zip
patch for sun X from jj
Diffstat (limited to 'todo.py')
-rw-r--r--todo.py21
1 files changed, 5 insertions, 16 deletions
diff --git a/todo.py b/todo.py
index 540c17e46..355b7fbd4 100644
--- a/todo.py
+++ b/todo.py
@@ -1480,22 +1480,11 @@ class ToDo:
pcmcia.createPcmciaConfig(self.instPath + "/etc/sysconfig/pcmcia")
self.copyConfModules ()
if not self.x.skip and self.x.server:
- if self.x.server[0:3] == 'Sun':
- try:
- os.unlink(self.instPath + "/etc/X11/X")
- except:
- pass
- script = open(self.instPath + "/etc/X11/X","w")
- script.write("#!/bin/bash\n")
- script.write("exec /usr/X11R6/bin/Xs%s -fp unix/:-1 $@\n" % self.x.server[1:])
- script.close()
- os.chmod(self.instPath + "/etc/X11/X", 0755)
- else:
- if os.access (self.instPath + "/etc/X11/X", os.R_OK):
- os.rename (self.instPath + "/etc/X11/X",
- self.instPath + "/etc/X11/X.rpmsave")
- os.symlink ("../../usr/X11R6/bin/" + self.x.server,
- self.instPath + "/etc/X11/X")
+ if os.access (self.instPath + "/etc/X11/X", os.R_OK):
+ os.rename (self.instPath + "/etc/X11/X",
+ self.instPath + "/etc/X11/X.rpmsave")
+ os.symlink ("../../usr/X11R6/bin/" + self.x.server,
+ self.instPath + "/etc/X11/X")
self.x.write (self.instPath + "/etc/X11")
self.setDefaultRunlevel ()