X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.zprofile;h=d5b10bde47a853bb6623104f30d9e2332652edae;hb=0f3191e50c5a585d589e46f31885f61e9525d021;hp=dc871b85e4ec5ae09040ccc3042ee642de8968eb;hpb=01642dab93f7f3a9d14cc1537ac06b74d986642d;p=grml-desktop.git

diff --git a/etc/skel/.zprofile b/etc/skel/.zprofile
index dc871b8..d5b10bd 100644
--- a/etc/skel/.zprofile
+++ b/etc/skel/.zprofile
@@ -1 +1,11 @@
-[[ -z $DISPLAY && -n "$XDG_VTNR" && "$XDG_VTNR" -eq 7 ]] && grml-x
+# handle automatic X.org/grml-x startup on Grml live system
+if [ -r /etc/grml_cd ] ; then
+  # /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