debian/changelog | 10 ++++++++++ debian/local/Failsafe/failsafeXServer | 28 ++++++++++++++++++---------- 2 files changed, 28 insertions(+), 10 deletions(-)
New commits: commit 5c2cefb0687533b6c3e9df455b00c7d009cf28bd Author: Bryce Harrington <br...@bryceharrington.org> Date: Mon Nov 9 00:02:21 2009 -0800 cl diff --git a/debian/changelog b/debian/changelog index cebe256..cc4b4d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +xorg (1:7.4+3ubuntu10) karmic; urgency=low + + * local/Failsafe/failsafeXServer: Since dexconf no longer produces + an xorg.conf, it will neither generate a failsafe xorg.conf, so now + we just generate one directly. Otherwise X won't start a failsafe + session properly. + (LP: #477149) + + -- Bryce Harrington <br...@ubuntu.com> Sun, 08 Nov 2009 23:59:36 -0800 + xorg (1:7.4+3ubuntu9) karmic-proposed; urgency=low * Restore 60x11-common_localhost. I dropped this before because the commit 5070c679e3ec7cb51c2f3b714c55b2ae796a0a04 Author: Bryce Harrington <br...@bryceharrington.org> Date: Sun Nov 8 23:59:08 2009 -0800 Instead of generating a failsafe xorg.conf using dexconf, just print a stock one directly. diff --git a/debian/local/Failsafe/failsafeXServer b/debian/local/Failsafe/failsafeXServer index 9d00e76..b4fe2a1 100755 --- a/debian/local/Failsafe/failsafeXServer +++ b/debian/local/Failsafe/failsafeXServer @@ -108,16 +108,24 @@ fi # If a matching entry is found, then use VGA 640x480/16 mode driver=$(get_driver) -if [ "x${run_dexconf}" = "xyes" ]; then - # Generate an appropriate xorg.conf - /etc/gdm/failsafeDexconf $driver $xorg_conf_failsafe - if [ ! -s $xorg_conf_failsafe ]; then - warn "Could not generate $xorg_conf_failsafe for $driver driver" - exit 1 - fi -elif [ ! -s $xorg_conf_failsafe ]; then - warn "Requested to use $xorg_conf_failsafe for $driver driver, but it does not exist" - exit 1 +# If no failsafe xorg.conf exists, generate a stock one +if [ ! -e $xorg_conf_failsafe ]; then + cat > $xorg_conf_failsafe <<EOF +Section "Device" + Identifier "Configured Video Device" + Driver "vesa" +EndSection + +Section "Monitor" + Identifier "Configured Monitor" +EndSection + +Section "Screen" + Identifier "Default Screen" + Monitor "Configured Monitor" + Device "Configured Video Device" +EndSection +EOF fi md5xorg=$(md5sum $xorg_conf) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org