Merge lp:~robert-ancell/mir/xmir-diagnostic-recovery-docs into lp:~mir-team/mir/trunk

[Robert Ancell]

Add some XMir diagnostic and recovery documentation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:783
http://jenkins.qa.ubuntu.com/job/mir-ci/842/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/80/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/842/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

15 +that case secure shell into to

perhaps:

In that case connect remotely into your machine (e.g, using SSH)...

... but not a blocker.

review: Approve

[Kevin DuBois (kdub)]

looks good to me too

review: Approve

=== modified file 'doc/using_mir_on_pc.md'
--- doc/using_mir_on_pc.md	2013-06-26 22:04:18 +0000
+++ doc/using_mir_on_pc.md	2013-06-27 04:45:36 +0000
@@ -56,14 +56,30 @@
     $ grep -i xmir /var/log/Xorg.0.log
     $ ls -l /var/log/lightdm/unity-system-compositor.log
 
+If problems occur, have a look at the following log files:
+
+    /var/log/lightdm/lightdm.log
+    /var/log/lightdm/unity-system-compositor.log
+    /var/log/lightdm/x-0.log
+
+You may not be able to get to a terminal if your video system has locked up. In
+that case secure shell into to your machine and read / copy these logs. They are
+overwritten on next boot.
 
 In any case, if you wish to deactivate XMir upon boot, simply comment out
 the type=unity line from
-/etc/lightdm/lightdm.conf.d10-unity-system-compositor.conf, like this:
+/etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf, like this:
 
     [SeatDefaults]
     #type=unity
 
+If you cannot boot into a graphical display or terminal to disable XMir, then
+enter recovery mode as described in https://wiki.ubuntu.com/RecoveryMode. From
+there edit / move / remove
+/etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf and then reboot.
+To modify the filesystem you will need to enter the following command:
+
+    # mount / -o remount,rw
 
 Running Mir natively
 --------------------