summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2006-01-30 18:14:29 +0000
committerDavid Cantrell <dcantrell@redhat.com>2006-01-30 18:14:29 +0000
commitbabbcb1b861dc2988407438b01d48c107693e37f (patch)
treee2856b7ba1196b221f012190f3a1bafdadcea985
parentbc39010fd19e647660d4fb854292d8a5ebe9eec3 (diff)
downloadanaconda-babbcb1b861dc2988407438b01d48c107693e37f.tar.gz
anaconda-babbcb1b861dc2988407438b01d48c107693e37f.tar.xz
anaconda-babbcb1b861dc2988407438b01d48c107693e37f.zip
* packages.py (writeXConfiguration): Do not create /etc/X11/X
symlink (#179321).
-rw-r--r--ChangeLog3
-rw-r--r--packages.py12
2 files changed, 2 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 3797b5586..60c6e4253 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2006-01-30 David Cantrell <dcantrell@redhat.com>
- * packages.py: /etc/X11/X -> /usr/bin/Xorg (#179321).
+ * packages.py (writeXConfiguration): Do not create /etc/X11/X
+ symlink (#179321).
2006-01-27 David Cantrell <dcantrell@redhat.com>
diff --git a/packages.py b/packages.py
index a3ca2a71b..c7f20a7a0 100644
--- a/packages.py
+++ b/packages.py
@@ -126,18 +126,6 @@ def writeXConfiguration(id, instPath):
log.info("Writing X configuration")
if not testmode:
fn = instPath
-
- if os.access (instPath + "/etc/X11/X", os.R_OK):
- os.rename (instPath + "/etc/X11/X",
- instPath + "/etc/X11/X.rpmsave")
-
- try:
- os.unlink (instPath + "/etc/X11/X")
- except OSError:
- pass
-
- os.symlink ("../../usr/bin/Xorg",
- instPath + "/etc/X11/X")
else:
fn = "/tmp/"