monitor-hotplug.sh: Fix detecting XAUTHORITY

Previously XAUTHORITY location was detected by filtering Xorg process command
line, which is not available in busybox ps implementation.

Instead detect correct Xorg commnad line by grepping for the "Xorg :displaynum"
and extract -auth argument.

If no -auth argument present then Xorg is running without display manager, thus
XAUTHORITY env var should remain undefined.

Signed-off-by: Daniel Levin <daniel.levin@amd.com>
Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 17 insertions, 2 deletions

diff --git a/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg/monitor-hotplug.sh b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg/monitor-hotplug.sh
index d603082d..bceb5607 100755
--- a/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg/monitor-hotplug.sh
+++ b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg/monitor-hotplug.sh
@@ -27,12 +27,27 @@ DEVICES=$(find /sys/class/drm/*/status)
 
 # inspired by /etc/acpd/lid.sh and the function it sources.
 
-displaynum=`ls /tmp/.X11-unix/* | sed s#/tmp/.X11-unix/X##`
+# Read first X display number from the list.
+displaynum=`ls /tmp/.X11-unix/* | sed s#/tmp/.X11-unix/X## | head -n 1`
+displaynum=${displaynum%% *}
+
 display=":$displaynum.0"
 export DISPLAY=":$displaynum.0"
 
 # from https://wiki.archlinux.org/index.php/Acpid#Laptop_Monitor_Power_Off
-export XAUTHORITY=$(ps -C Xorg -f --no-header | sed -n 's/.*-auth //; s/ -[^ ].*//; p')
+
+# Clear XAUTHORITY by default in case X session is not using display manager.
+unset XAUTHORITY
+
+# Detect X session command line started for the display $displaynum and extract
+# -auth argument if any.
+ps -eo args | grep -e "Xorg\W*:$displaynum" | grep -e -auth | while read -r line
+do
+        if [[ "${line%% *}" == *Xorg ]]; then
+                export XAUTHORITY=`echo $line | sed -n 's/.*-auth //; s/ -[^ ].*//; p'`
+                break
+        fi
+done
 
 for i in /sys/class/drm/*/*/status ;
 do