From 290c4c05156c28cfaa18b8cc97c6ba3ac48cfa31 Mon Sep 17 00:00:00 2001
From: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue, 30 Jun 2009 23:21:08 +0300
Subject: [PATCH] livecd.sh: Don't mess with xorg.conf anymore, we don't
 install one by default.

---
 debian/changelog | 7 +++++++
 livecd.sh        | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62577cf1..c32f5753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (0.87) UNRELEASED; urgency=low
+
+  * livecd.sh: Don't mess with xorg.conf anymore, we don't install one
+    by default.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 30 Jun 2009 23:20:20 +0300
+
 livecd-rootfs (0.86) karmic; urgency=low
 
   [ Scott Kitterman ]
diff --git a/livecd.sh b/livecd.sh
index 7eeb8f43..a2b15d4b 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -472,9 +472,6 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
 
     # get rid of the .debs - we don't need them.
     chroot ${ROOT} apt-get clean
-    rm -f ${ROOT}etc/X11/xorg.conf
-    # Restore an empty xorg.conf, else xserver-xorg postinst will be confused
-    touch ${ROOT}etc/X11/xorg.conf
     rm -f ${ROOT}var/lib/apt/lists/*_*
     rm -f ${ROOT}var/spool/postfix/maildrop/*
     # Removing update-notifier notes is now considered harmful: