From: Michael Prokop <mika@grml.org>
Date: Sun, 28 May 2017 17:50:49 +0000 (+0200)
Subject: startx: use /var/run/grml-x/window-manager for selection of specific window manager
X-Git-Tag: v0.5.2~1
X-Git-Url: http://git.grml.org/?p=grml-desktop.git;a=commitdiff_plain;h=0f3191e50c5a585d589e46f31885f61e9525d021

startx: use /var/run/grml-x/window-manager for selection of specific window manager

Closes grml/grml#44
---

diff --git a/etc/skel/.zprofile b/etc/skel/.zprofile
index 6c813b4..d5b10bd 100644
--- a/etc/skel/.zprofile
+++ b/etc/skel/.zprofile
@@ -1,4 +1,11 @@
 # handle automatic X.org/grml-x startup on Grml live system
 if [ -r /etc/grml_cd ] ; then
-  [[ -z "$DISPLAY" && -n "$XDG_VTNR" && "$XDG_VTNR" -eq 7 ]] && grml-x
+  # /var/run/grml-x/window-manager is an ugly hack to share
+  # selection of window manager via startx boot option
+  # and grml-quickconfig with this startup wrapper
+  if [ -r /var/run/grml-x/window-manager ] ; then
+    [[ -z "$DISPLAY" && -n "$XDG_VTNR" && "$XDG_VTNR" -eq 7 ]] && grml-x "$(cat /var/run/grml-x/window-manager)"
+  else
+    [[ -z "$DISPLAY" && -n "$XDG_VTNR" && "$XDG_VTNR" -eq 7 ]] && grml-x
+  fi
 fi