done
}
+# Check if X server is running
+#
+# If xset is missing, we rely on the existence of the $DISPLAY variable.
+NO_DISPLAY=0
+if exectest xset ; then
+ if ! timeout 1s xset q &>/dev/null ; then
+ NO_DISPLAY=1
+ fi
+elif [ -z "${DISPLAY}" ] ; then
+ NO_DISPLAY=1
+fi
+
+if [ "${NO_DISPLAY}" -eq 1 ] ; then
+ $_opt_quiet || echo "W: Running without X server. Not all data will be collected."
+fi
+
cd "${OUTDIR}" || exit 1
(
if ! $_opt_quiet ; then
fi
uname -a > ./uname
+ # inxi
+ exectest inxi && inxi -F -xx > ./inxi 2>./inxi.error
+ exectest inxi && inxi -FJ --admin > ./inxi_admin 2>./inxi_admin.error
+
# disks / devices
[ -f /proc/scsi/scsi ] && cat /proc/scsi/scsi > scsi
exectest lspci && lspci -nn > ./lspci
dpkg -S "/boot/vmlinuz-$(uname -r)" >> running_kernel 2>>running_kernel.error
# X stuff
- if [ -n "${DISPLAY}" ] ; then
+ if [ "${NO_DISPLAY}" -eq 0 ] ; then
exectest xviddetect && xviddetect > ./xviddetect
exectest xvidtune && xvidtune -show > ./xdivtune
exectest xrandr && xrandr > ./xrandr
if exectest sdparm ; then
echo -e "sdparm --all --long /dev/${disk}:\n" >> sdparm
- sdparm --all --long "/dev/$disk" >> ./sdparm
+ echo -e "stderr for sdparm --all --long /dev/${disk}:\n" >> sdparm.error
+ sdparm --all --long "/dev/$disk" >> ./sdparm 2>> ./sdparm.error
echo -e "\n\n" >> sdparm
+ echo -e "\n\n" >> sdparm.error
fi
if exectest sg_inq ; then