This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from c6106bd usbmount/x2gousbmount: whitespace- and comment-only changes. new e3370bf usbmount/x2gousbmount: rework x2gothinclientd check. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + usbmount/x2gousbmount | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit e3370bf2f2aa09b59d43cefb6d8b09320647b357 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 18 01:27:41 2019 +0100 usbmount/x2gousbmount: rework x2gothinclientd check. --- debian/changelog | 1 + usbmount/x2gousbmount | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e5d77b..1cac657 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2gothinclient (1.5.0.1-0x2go1) UNRELEASED; urgency=medium - management/etc/x2gothinclient_settings: add "extras" component. * usbmount/x2gousbmount: - Whitespace- and comment-only changes. + - Rework x2gothinclientd check. [ Stefan Baur ] * New upstream release (1.5.0.1): diff --git a/usbmount/x2gousbmount b/usbmount/x2gousbmount index 3ecce00..fca56ee 100755 --- a/usbmount/x2gousbmount +++ b/usbmount/x2gousbmount @@ -83,8 +83,8 @@ sub check_x2gothinclientmode { my $ret = 0; # Check for x2gothinclientd first... - my $x = `ps ax | grep x2gothinclient`; - if ($x =~ m/thinclientd/) + my $x = `ps u -C x2gothinclientd`; + if ($x =~ m/\W*x2gothinclientd\W*/) { $ret = 1; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org