Merge branch 'fellowseb-add-startxargs-option' into develop

dopsi · Sep 22, 2018 · 110a75e · 110a75e
2 parents d8887b1 + 2c8e747
commit 110a75e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tdm b/tdm
@@ -69,6 +69,7 @@ CONFDIR="$(load_confdir_path)"
 SESSIONS=${CONFDIR}/sessions
 EXTRA=${CONFDIR}/extra
 SAVELAST=1
+STARTXARGS=
 
 eval set -- "$(
     getopt -o h \
@@ -245,11 +246,11 @@ elif [[ (-n $sid) && ($sid -lt $XID) && ($sid -ge 0) ]]; then
     else
         ln -sf "${xsessions[${sid}]}" "/tmp/tdmdefault"
     fi
-    startx
+    startx ${STARTXARGS}
 else
     echo "Unknown value, load default."
     if [ -x "${CONFDIR}/default" ]; then
-        startx
+        startx ${STARTXARGS}
     else
         fallback "Session not defined, fallback."
     fi

diff --git a/tdminit b/tdminit
@@ -24,5 +24,8 @@
 # Uncomment to show linux logo
 #linux_logo -L classic
 
+# Args passed along when calling startx
+#STARTXARGS=
+
 # Uncomment to start X without selecting a session
 #exec startx