debian/changelog | 13 +++++++++++++
debian/local/Failsafe/failsafeXServer | 10 +++-------
2 files changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 9589d9789c1a87d9660b3ee362cf843ebfed9757
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Mon Feb 22 22:44:22 2010 -0800
Make failsafeXServer select fbdev properly when KMS is in use, so the
failsafeX session starts up properly.
diff --git a/debian/changelog b/debian/changelog
index 58a1dc7..ec9f4b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xorg (1:7.5+1ubuntu7) lucid; urgency=low
+
+ * debian/local/Failsafe/failsafeXServer:
+ + Actually produce xorg.conf.failsafe with the detected driver.
+ Important for failures while running in KMS mode.
+ (LP: #496773)
+ + Force overwrite of existing xorg.conf.failsafe. Since above
+ change produces different xorg.conf.failsafe's depending on
+ what driver was selected, we must force it to regen each time.
+ (LP: #480747)
+
+ -- Bryce Harrington <br...@ubuntu.com> Mon, 22 Feb 2010 22:38:22 -0800
+
xorg (1:7.5+1ubuntu6) lucid; urgency=low
* debian/scripts/*: Revert last change; we still need -nv for riva and a
diff --git a/debian/local/Failsafe/failsafeXServer
b/debian/local/Failsafe/failsafeXServer
index ce51e09..b816b7a 100755
--- a/debian/local/Failsafe/failsafeXServer
+++ b/debian/local/Failsafe/failsafeXServer
@@ -109,12 +109,11 @@ fi
# If a matching entry is found, then use VGA 640x480/16 mode
driver=$(get_driver)
-# If no failsafe xorg.conf exists, generate a stock one
-if [ ! -e $xorg_conf_failsafe ]; then
- cat > $xorg_conf_failsafe <<EOF
+# Generate a fresh xorg.conf.failsafe using identified driver
+cat > $xorg_conf_failsafe <<EOF
Section "Device"
Identifier "Configured Video Device"
- Driver "vesa"
+ Driver "$driver"
EndSection
Section "Monitor"
@@ -127,7 +126,6 @@ Section "Screen"
Device "Configured Video Device"
EndSection
EOF
-fi
md5xorg=$(md5sum $xorg_conf)
date +"%s $md5xorg" >> $failsafe_log
@@ -135,8 +133,6 @@ if [ $? -ne 0 ]; then
warn "Cannot write to $failsafe_log"
fi
-# TODO: Start up the failsafe X session using their regular user account
-
if pidof /usr/sbin/gdm ; then
clientargs="${clientargs} with-gdm"
fi
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1njow9-000809...@alioth.debian.org
