From 404dfbd6d95ebcf66e2d510f1ea5af5ee41a038c Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 25 Aug 2015 17:02:28 -0300 Subject: Do not start window manager if not on wheezy --- xsessionrc.dot.link | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xsessionrc.dot.link') diff --git a/xsessionrc.dot.link b/xsessionrc.dot.link index c35afc8..5b238ff 100755 --- a/xsessionrc.dot.link +++ b/xsessionrc.dot.link @@ -84,7 +84,7 @@ if which parcellite &> /dev/null; then parcellite -n & fi -# Execute window manager +# Keyring if [ "$OSVERSION" != "6" ]; then # See https://bugzilla.redhat.com/show_bug.cgi?id=783568 # https://bugs.launchpad.net/ubuntu/+source/gnome-keyring/+bug/932177 @@ -94,7 +94,9 @@ if [ "$OSVERSION" != "6" ]; then #unset GNOME_KEYRING_CONTROL #eval $(gnome-keyring-daemon --start --components=pkcs11,gpg,secrets) eval $(gnome-keyring-daemon --start --components=pkcs11,secrets) +fi - # Start window manager +# Start window manager +if [ "$OSVERSION" == "7" ]; then $WINDOW_MANAGER fi -- cgit v1.2.3