diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-08-25 17:02:28 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-08-25 17:02:28 -0300 |
| commit | 404dfbd6d95ebcf66e2d510f1ea5af5ee41a038c (patch) | |
| tree | d66e9f43f3c2ec7e5698268ac97c87abacd2ab99 | |
| parent | b3377d7380723ad3293614b532ed7c457122d43f (diff) | |
| download | profile-404dfbd6d95ebcf66e2d510f1ea5af5ee41a038c.tar.gz profile-404dfbd6d95ebcf66e2d510f1ea5af5ee41a038c.tar.bz2 | |
Do not start window manager if not on wheezy
| -rwxr-xr-x | xsessionrc.dot.link | 6 |
1 files changed, 4 insertions, 2 deletions
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 |