From babbcb1b861dc2988407438b01d48c107693e37f Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Mon, 30 Jan 2006 18:14:29 +0000
Subject:         * packages.py (writeXConfiguration):  Do not create
 /etc/X11/X         symlink (#179321).

---
 ChangeLog   |  3 ++-
 packages.py | 12 ------------
 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/"
 
-- 
cgit