Backport: setup.sh: Set STARTUP, late load Xsession

Signed-off-by: AnErrupTion <anerruption@disroot.org>

res/ly-sysvinit

@@ -13,7 +13,7 @@
 #
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DAEMON=/usr/bin/ly
+DAEMON=$PREFIX_DIRECTORY/bin/ly
 TTY=/dev/tty$DEFAULT_TTY
 PIDFILE=/var/run/ly.pid
 NAME=ly

res/ly@.service

@@ -15,7 +15,7 @@ After=systemd-user-sessions.service plymouth-quit-wait.service getty@%i.service
 Conflicts=getty@%i.service kmsconvt@%i.service ly-kmsconvt@%i.service
 
 [Service]
-ExecStart=$PREFIX_DIRECTORY/bin/agetty -nl $PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME %I ${TERM}
+ExecStart=$PREFIX_DIRECTORY/sbin/agetty -nl $PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME %I ${TERM}
 Type=idle
 Restart=always
 RestartSec=0

res/setup.sh

@@ -70,25 +70,6 @@ if [ "$XDG_SESSION_TYPE" = "x11" ]; then
         done
     fi
 
-    # Load Xsession scripts
-    # OPTIONFILE, USERXSESSION, USERXSESSIONRC and ALTUSERXSESSION are required
-    # by the scripts to work
-    xsessionddir="$CONFIG_DIRECTORY"/X11/Xsession.d
-    export OPTIONFILE="$CONFIG_DIRECTORY"/X11/Xsession.options
-    export USERXSESSION="$HOME"/.xsession
-    export USERXSESSIONRC="$HOME"/.xsessionrc
-    export ALTUSERXSESSION="$HOME"/.Xsession
-
-    if [ -d "$xsessionddir" ]; then
-        for i in $(ls "$xsessionddir"); do
-            script="$xsessionddir/$i"
-            echo "Loading X session script $script"
-            if [ -r "$script" ] && [ -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
-                . "$script"
-            fi
-        done
-    fi
-
     if [ -f "$USERXSESSION" ]; then
         . "$USERXSESSION"
     fi
@@ -102,6 +83,28 @@ if [ "$XDG_SESSION_TYPE" = "x11" ]; then
     fi
     [ -f "$HOME"/.Xresources ] && xrdb -merge "$HOME"/.Xresources
     [ -f "$XDG_CONFIG_HOME"/X11/Xresources ] && xrdb -merge "$XDG_CONFIG_HOME"/X11/Xresources
+
+    # Load Xsession scripts
+    # OPTIONFILE, USERXSESSION, USERXSESSIONRC and ALTUSERXSESSION are required
+    # by the scripts to work
+    xsessionddir="$CONFIG_DIRECTORY"/X11/Xsession.d
+    export OPTIONFILE="$CONFIG_DIRECTORY"/X11/Xsession.options
+    export USERXSESSION="$HOME"/.xsession
+    export USERXSESSIONRC="$HOME"/.xsessionrc
+    export ALTUSERXSESSION="$HOME"/.Xsession
+    # Some distributions have an Xsession script containing "exec $STARTUP",
+    # this makes sure to set the variable to what we actually want to launch
+    export STARTUP="$@"
+
+    if [ -d "$xsessionddir" ]; then
+        for i in $(ls "$xsessionddir"); do
+            script="$xsessionddir/$i"
+            echo "Loading X session script $script"
+            if [ -r "$script" ] && [ -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+                . "$script"
+            fi
+        done
+    fi
 fi
 
 exec "$@"