From 58dfbde2bafa1f48248e55fc0476bdb621277300 Mon Sep 17 00:00:00 2001
From: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
Date: May 22 2015 15:20:31 +0000
Subject: Updates to Xorg, DRM, desktop info


GDM puts Xorg logs in ~/.local/share/xorg/Xorg.0.log
Others still seem to use standard directory.

---

diff --git a/fpaste b/fpaste
index 6358f97..07085b7 100755
--- a/fpaste
+++ b/fpaste
@@ -195,7 +195,7 @@ def sysinfo(show_stderr = False, show_successful_cmds = True, show_failed_cmds =
     cmdlist = [
         ('OS Release',         '''lsb_release -ds''', '''cat /etc/*-release | uniq''', 'cat /etc/issue', 'cat /etc/motd'),
         ('Kernel',             '''uname -r ; cat /proc/cmdline'''),
-        ('Desktop(s) Running', '''ps -eo comm= | grep -E '(gnome-session|startkde|startactive|xfce.?-session|fluxbox|blackbox|hackedbox|ratpoison|enlightenment|icewm-session|od-session|wmaker|wmx|openbox-lxde|openbox-gnome-session|openbox-kde-session|mwm|e16|fvwm|xmonad|sugar-session|mate-session)' '''),
+        ('Desktop(s) Running', '''ps -eo comm= | grep -E '(gnome-session|startkde|startactive|xfce.?-session|fluxbox|blackbox|hackedbox|ratpoison|enlightenment|icewm-session|od-session|wmaker|wmx|openbox-lxde|openbox-gnome-session|openbox-kde-session|mwm|e16|fvwm|xmonad|sugar-session|mate-session|lxqt-session|cinnamon)' '''),
         ('Desktop(s) Installed', '''ls -m /usr/share/xsessions/ | sed 's/\.desktop//g' '''),
         ('SELinux Status',      '''sestatus''', '''/usr/sbin/sestatus''', '''getenforce''', '''grep -v '^#' /etc/sysconfig/selinux'''),
         ('SELinux Error Count', '''selinuxenabled && journalctl --since yesterday |grep avc: |grep -Eo "comm=\"[^ ]+" |sort |uniq -c |sort -rn'''),
@@ -211,10 +211,10 @@ def sysinfo(show_stderr = False, show_successful_cmds = True, show_failed_cmds =
         ('Block devices',      '''blkid''', '''/sbin/blkid'''),
         ('PCI devices',        '''lspci''', '''/sbin/lspci'''),
         ('USB devices',        '''lsusb''', '''/sbin/lsusb'''),
-        ('DRM Information',    '''journalctl -k -b | grep drm'''),
-        ('Xorg modules',       '''grep LoadModule /var/log/Xorg.0.log | cut -d \\" -f 2 | xargs'''),
+        ('DRM Information',    '''journalctl -k -b | grep -o 'kernel:.*drm.*$' | cut -d ' ' -f 2- '''),
+        ('Xorg modules',       '''grep LoadModule /var/log/Xorg.0.log ~/.local/share/xorg/Xorg.0.log | cut -d \\" -f 2 | xargs'''),
         ('GL Support',         '''glxinfo | grep -E "OpenGL version|OpenGL renderer"'''),
-        ('Xorg errors',        '''grep '^\[.*(EE)' /var/log/Xorg.0.log'''),
+        ('Xorg errors',        '''grep '^\[.*(EE)' /var/log/Xorg.0.log ~/.local/share/xorg/Xorg.0.log | cut -d ':' -f 2- '''),
         ('Kernel buffer tail', '''dmesg | tail'''),
         ('Last few reboots',   '''last -x -n10 reboot runlevel'''),
         ('DNF Repositories',   '''dnf -C repolist''', '''ls -l /etc/yum.repos.d''', '''grep -v '^#' /etc/yum.conf'''),