X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.zprofile;h=d5b10bde47a853bb6623104f30d9e2332652edae;hb=0f3191e50c5a585d589e46f31885f61e9525d021;hp=6c813b44f03d8189fdae083a8ad88b070797bc6a;hpb=50fd23f9a2f60ee26cfcf5f1eb9b4f036ecc432b;p=grml-desktop.git 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