xorg: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/local/Failsafe/failsafeXinit | 21 +++++++++++++++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit 0583e338a5f038e21ca7bc7f9fcd2d91496a5a1a
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Fri Sep 19 12:20:05 2008 -0700
Added patch from Michael Larabel to add a save-logs option
to bulletproof-x mode.
diff --git a/debian/changelog b/debian/changelog
index 6bee7ff..23d78c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.4~2ubuntu3) intrepid; urgency=low
+
+ [Michael Larabel]
+ * local/Failsafe/failsafeXinit: Add option to enable user to archive the
+ relevant log files for bug reporting purposes.
+
+ -- Bryce Harrington <bryce@ubuntu.com> Fri, 19 Sep 2008 12:17:46 -0700
+
xorg (1:7.4~2ubuntu2) UNRELEASED; urgency=low
[Loic Minier]
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index 6a8f451..9211a18 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -74,9 +74,10 @@ 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" \
--hide-column 2
-# TODO: 4 VERIFY_XORGCONF "Check configuration file"
-# TODO: 5 EXIT_TO_CONSOLE "Exit to console" \
+# TODO: 5 VERIFY_XORGCONF "Check configuration file"
+# TODO: 6 EXIT_TO_CONSOLE "Exit to console" \
}
# TODO: Should we just go ahead and file a bug for them without presenting an option?
@@ -145,6 +146,21 @@ edit_config() {
gksu gedit $xorg_conf
}
+save_config_logs() {
+ xorg_backup_name=failsafeX-backup-${timestamp}
+ xorg_backup_dir=$(mktemp -d -t ${xorg_backup_name}.XXX)
+ xorg_backup_file=/var/log/${xorg_backup_name}.tar
+
+ # cp $xorg_conf $xorg_backup_dir
+ cp /etc/X11/xorg.conf $xorg_backup_dir
+ cp $xorg_log $xorg_backup_dir
+ cp $gdm_log $xorg_backup_dir
+ 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 --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."
@@ -167,6 +183,7 @@ while : ; do
VIEW_GDM_LOG ) choice="TROUBLESHOOT"; view_gdm_log ;;
VERIFY_XORGCONF ) choice="TROUBLESHOOT"; verify_xorgconf ;;
EDIT_CONFIG ) choice="TROUBLESHOOT"; edit_config ;;
+ SAVE_CONFIG_LOGS ) choice="TROUBLESHOOT"; save_config_logs ;;
EXIT_TO_CONSOLE ) with_gdm=""; break ;;
EXIT ) break ;;
Reply to: