xorg: Changes to 'ubuntu'
debian/changelog | 3 ++-
debian/local/Failsafe/failsafeXServer | 6 +-----
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 5de25bf7dc509aa7f263441d7e75f45bdeafa229
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Fri Sep 19 17:11:45 2008 -0700
changelog entry
diff --git a/debian/changelog b/debian/changelog
index a0e66d8..e3f8265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,11 @@ xorg (1:7.4~2ubuntu4) UNRELEASED; urgency=low
of alternate fallback driver. (LP: #272086)
- Add detection of ppc hardware and prefer 'fbdev' instead of 'vesa'
in this case (LP: #155685)
+ - Send log to Xorg.failsafe.log when in failsafe mode (LP: #179164)
* local/Failsafe/failsafeDexconf:
- Re-sync with dexconf; use input-hotplug for devices. (LP: #227818)
- -- Bryce Harrington <bryce@ubuntu.com> Fri, 19 Sep 2008 16:01:43 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Fri, 19 Sep 2008 17:11:13 -0700
xorg (1:7.4~2ubuntu3) intrepid; urgency=low
commit 5777cde17cf5f2c91e91e44e8cf639e2c0adea12
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Fri Sep 19 17:10:34 2008 -0700
Send log to Xorg.failsafe.log (LP: #179164)
diff --git a/debian/local/Failsafe/failsafeXServer b/debian/local/Failsafe/failsafeXServer
index 8c99e9e..9c6024a 100755
--- a/debian/local/Failsafe/failsafeXServer
+++ b/debian/local/Failsafe/failsafeXServer
@@ -37,11 +37,7 @@ failsafe_log=${BPX_LOG:-"/var/log/gdm/failsafe.log"}
server=${BPX_SERVER:-/usr/bin/X}
serverargs=${BPX_SERVERARGS:-"$*"}
-if [ -z "$serverargs" ]; then
- # Use :10 to avoid overwriting the (failed) Xorg.0.log
- serverargs=":10"
-fi
-serverargs="${serverargs} -br -once -config $xorg_conf_failsafe"
+serverargs="${serverargs} -br -once -config $xorg_conf_failsafe -logfile /var/log/Xorg.failsafe.log"
# -br: Black background
# -once: Terminate server after one session
# -config: Specify location of xorg.conf file to use
Reply to: