xorg: Changes to 'ubuntu'
debian/changelog | 4 +++-
debian/local/Failsafe/failsafeXServer | 1 +
debian/local/Failsafe/failsafeXinit | 12 +++++++++---
3 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 881cbac0c862f2c8387226e073464889fe932af0
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Fri Sep 19 20:32:52 2008 -0700
changelog entry for previous commit. Also tweak verbage of save logs stuff.
diff --git a/debian/changelog b/debian/changelog
index e3f8265..50c7e04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ xorg (1:7.4~2ubuntu4) UNRELEASED; urgency=low
- 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)
+ * local/Failsafe/failsafeXinit:
+ - Display the X errors on initial dialog. (LP: #148122)
- -- Bryce Harrington <bryce@ubuntu.com> Fri, 19 Sep 2008 17:11:13 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Fri, 19 Sep 2008 19:00:06 -0700
xorg (1:7.4~2ubuntu3) intrepid; urgency=low
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index 2943e24..66e90bd 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -74,7 +74,7 @@ display_troubleshooting_menu() {
1 VIEW_XORG_LOG "Review the xserver log file" \
2 VIEW_GDM_LOG "Review the startup errors" \
3 EDIT_CONFIG "Edit configuration file" \
- 4 SAVE_CONFIG_LOGS "Save configuration and logs" \
+ 4 SAVE_CONFIG_LOGS "Archive configuration and logs" \
--hide-column 2
# TODO: 5 VERIFY_XORGCONF "Check configuration file"
# TODO: 6 EXIT_TO_CONSOLE "Exit to console" \
@@ -158,7 +158,7 @@ save_config_logs() {
tar -cf $xorg_backup_file $xorg_backup_dir
rm -rf $xorg_backup_dir
- zenity --info --text "Relevant configuration and log files have been saved to:\n$xorg_backup_file\nBug reports can be submitted at http://www.launchpad.net/.\n";
+ zenity --info --text "Relevant configuration and log files have been saved to:\n$xorg_backup_file\nBug reports can be submitted at http://www.launchpad.net/ubuntu/.\n";
}
# Scan Xorg.0.log for errors
commit daa642ff21d73f7fabf8d04288b7b7e5826f121f
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Fri Sep 19 18:59:46 2008 -0700
Display error messages on initial prompt
diff --git a/debian/local/Failsafe/failsafeXServer b/debian/local/Failsafe/failsafeXServer
index 9c6024a..df8e3a6 100755
--- a/debian/local/Failsafe/failsafeXServer
+++ b/debian/local/Failsafe/failsafeXServer
@@ -42,6 +42,7 @@ serverargs="${serverargs} -br -once -config $xorg_conf_failsafe -logfile /var/lo
# -once: Terminate server after one session
# -config: Specify location of xorg.conf file to use
# Note: Only root can specify absolute paths
+ # -logfile: Don't overwrite Xorg.0.log
warn() {
echo "Warning: $1" 1>&2
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index 9211a18..2943e24 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -161,8 +161,14 @@ save_config_logs() {
zenity --info --text "Relevant configuration and log files have been saved to:\n$xorg_backup_file\nBug reports can be submitted at http://www.launchpad.net/.\n";
}
+# Scan Xorg.0.log for errors
+LOG_ERRORS=$(grep -e "^(EE)" $xorg_log)
-zenity --warning --text "<big><b>Ubuntu is running in low-graphics mode</b></big>\n\nYour screen, graphics card, and input device settings\ncould not be detected correctly. You will need to configure these yourself."
+if [ -z "$LOG_ERRORS" ]; then
+ zenity --warning --text "<big><b>Ubuntu is running in low-graphics mode</b></big>\n\nYour screen, graphics card, and input device settings\ncould not be detected correctly. You will need to configure these yourself."
+else
+ zenity --warning --text "<big><b>Ubuntu is running in low-graphics mode</b></big>\n\nThe following error was encountered. You may need\nto update your configuration to solve this.\n\n${LOG_ERRORS}"
+fi
# TODO: Add --window-icon "$app_icon" to all zenity windows
Reply to: