This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 0e0012f26abef7e8638229304b3b023974f9a152 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Aug 27 13:47:26 2014 +0200 Enable usbmounts and smartcard rules for minidestop TCE flavour. --- debian/changelog | 1 + smartcardrules/x2gognupgccid | 8 ++++++-- usbmount/x2gousbmount | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7688cf9..e67cfe6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low . Make contrib and non-free software available on minidesktop TCE creation. . Disallow Caja to handle storage media (automounting, opening, etc.). + . Enable usbmounts and smartcard rules for minidestop TCE flavour. - Adapt management package to TCE flavouring. Add new configuration option in x2gothinclient_settings: TC_FLAVOUR (can be: minidesktop or displaymanager). diff --git a/smartcardrules/x2gognupgccid b/smartcardrules/x2gognupgccid index b7715fd..27dbb34 100755 --- a/smartcardrules/x2gognupgccid +++ b/smartcardrules/x2gognupgccid @@ -22,8 +22,12 @@ GROUP=scard set -e -# only do this if x2gothinclientd is default display manager, otherwise this makes no sense -if ps ax | grep x2gothinclient | grep thinclientd 1>/dev/null; then +# Only do this if x2gothinclientd is default display manager +# or if the package x2gothinclient-minidesktop is installed. +# +# Otherwise this makes no sense... + +if ps ax | grep x2gothinclient | grep thinclientd 1>/dev/null || [ -d "/usr/share/doc/x2gothinclient-minidesktop" ]; then DEV=`echo ${DEVICE} | sed 's/proc/dev/'` diff --git a/usbmount/x2gousbmount b/usbmount/x2gousbmount index 6e7965c..472e2ef 100755 --- a/usbmount/x2gousbmount +++ b/usbmount/x2gousbmount @@ -34,7 +34,7 @@ sub check_x2gothinclientd { return 0; } -if ( check_x2gothinclientd() ) +if ( check_x2gothinclientd() || ( -d "/usr/share/doc/x2gothinclient-minidesktop" ) ) { open (F,">>/var/log/usb"); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git