Fix XFCE not starting on device boot-up

Change-type: patch
Signed-off-by: Alexandru Costache <alexandru@balena.io>

Author: acostach

jetson-orin/Dockerfile

@@ -63,8 +63,9 @@ ENV LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu/tegra
 # Prevent screen from turning off
 RUN echo "#!/bin/bash" > /etc/X11/xinit/xserverrc \
    && echo "" >> /etc/X11/xinit/xserverrc \
-   && echo 'exec /usr/bin/X -s 0 dpms' >> /etc/X11/xinit/xserverrc && \
-   echo 'modules=("tegra_drm" "nvidia_drm" "nvidia_modeset"); for module in "${modules[@]}"; do if lsmod | grep -q ${module} ; then echo "Found $module"; rmmod $module; fi; done; startxfce4 & sleep 5; modprobe tegra_drm; modprobe nvidia_drm; while [ 1 ]; do sleep 10; done; ' > /opt/startxfce.sh
+   && echo 'exec /usr/bin/X -s 0 dpms' >> /etc/X11/xinit/xserverrc
+
+
 
 ## If any apt packages install mesa-egl, it will overwrite the tegra-egl
 ## symlink and ld path, so the following command will ensure tegra-egl remains
@@ -122,6 +123,8 @@ RUN echo "#!/bin/bash" > /etc/X11/xinit/xserverrc \
 ## deviceQuery, CUDA Driver = CUDART, CUDA Driver Version = 12.6, CUDA Runtime Version = 12.6, NumDevs = 1
 ## Result = PASS
 
+COPY startxfce.sh /opt/startxfce.sh
+RUN chmod +x /opt/startxfce.sh
 COPY entry.sh /usr/bin/entry.sh
 RUN chmod +x /usr/bin/entry.sh
 

jetson-orin/entry.sh

@@ -67,5 +67,4 @@ echo "Starting UDEV..."
 start_udev
 
 echo "Starting xfce script."
-chmod +x /opt/startxfce.sh
 exec /opt/startxfce.sh

jetson-orin/startxfce.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Ensure plymouth exited so that it won't hold /dev/fb0 open and tegra_drm can be unloaded
+DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket \
+  dbus-send \
+  --system \
+  --print-reply \
+  --dest=org.freedesktop.systemd1 \
+  /org/freedesktop/systemd1 \
+  org.freedesktop.systemd1.Manager.StopUnit \
+  string:plymouth-quit.service string:replace
+  
+# Prevent "Server is already active for display 0" error,
+# in case X was forcedly closed before
+rm -rf /tmp/.X0-lock* || true
+
+# Prevent black screen with cursor only
+rm -rf /root/.config/ || true
+
+modules=("tegra_drm" "nvidia_drm" "nvidia_modeset"); for module in "${modules[@]}";
+do
+    if lsmod | grep -q ${module} ; then
+        echo "Found $module"; rmmod $module;
+    fi;
+done;
+
+startxfce4 & sleep 5;
+
+modprobe tegra_drm;
+modprobe nvidia_drm;
+while [ 1 ]; do
+   sleep 10;
+done;