This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from 5bfef60 fix x2gothinclient-minidesktop.init here and there new 4734965 Don't run x2gothinclient_init inside TCE chroot operations (x2gothinclient_shell or x2gothinclient_upgrade). new 139a6e4 Avoid x2gothinclient_init failures, use if..then..fi instead of the test command. The 2 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 | 4 +++ .../share/etc/x2gothinclient_init | 38 ++++++++++++-------- 2 files changed, 28 insertions(+), 14 deletions(-) -- Alioth's /srv/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 4734965633ce9fd8b672e08f2c9595a51a260e47 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Aug 23 00:27:35 2014 +0200 Don't run x2gothinclient_init inside TCE chroot operations (x2gothinclient_shell or x2gothinclient_upgrade). --- debian/changelog | 2 ++ .../share/etc/x2gothinclient_init | 30 +++++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index e2d7a4f..2764c23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low - Tweak MATE minidesktop via GScheme overrides. - Add XDG autostart .desktop file for X2Go Client. - Run x2gothinclient_shell and x2gothinclient_upgrade with LANG=C. + - Don't run x2gothinclient_init inside TCE chroot operations + (x2gothinclient_shell or x2gothinclient_upgrade). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Feb 2014 12:03:00 +0100 diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_init b/x2gothinclientmanagement/share/etc/x2gothinclient_init index b0609ea..318ddd5 100755 --- a/x2gothinclientmanagement/share/etc/x2gothinclient_init +++ b/x2gothinclientmanagement/share/etc/x2gothinclient_init @@ -20,17 +20,19 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mkdir -p ~x2gothinclient -mkdir -p ~x2gothinclient/.x2goclient -test -e /etc/x2go/x2gothinclient_sessions && cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions -test -e /etc/x2go/freerdp/known_hosts && mkdir -p ~x2gothinclient/.freerdp && cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts -test -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop && mkdir -p ~x2gothinclient/Desktop && cp /etc/xdg/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ -mkdir -p ~x2gothinclient/.kde -mkdir -p ~x2gothinclient/.kde/socket-`hostname` -mkdir -p ~x2gothinclient/mounts -mkdir -p ~x2gothinclient/export -mkdir -p ~x2gothinclient/logins -mkdir -p ~x2gothinclient/.ssh -mkdir -p ~x2gothinclient/.x2go -chown x2gothinclient:x2gothinclient ~x2gothinclient -Rf -chmod go-rwx ~x2gothinclient -Rf +if [ -z "$X2GO_HANDLE_DAEMON" ]; then + mkdir -p ~x2gothinclient + mkdir -p ~x2gothinclient/.x2goclient + test -e /etc/x2go/x2gothinclient_sessions && cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions + test -e /etc/x2go/freerdp/known_hosts && mkdir -p ~x2gothinclient/.freerdp && cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts + test -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop && mkdir -p ~x2gothinclient/Desktop && cp /etc/xdg/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ + mkdir -p ~x2gothinclient/.kde + mkdir -p ~x2gothinclient/.kde/socket-`hostname` + mkdir -p ~x2gothinclient/mounts + mkdir -p ~x2gothinclient/export + mkdir -p ~x2gothinclient/logins + mkdir -p ~x2gothinclient/.ssh + mkdir -p ~x2gothinclient/.x2go + chown x2gothinclient:x2gothinclient ~x2gothinclient -Rf + chmod go-rwx ~x2gothinclient -Rf +fi -- Alioth's /srv/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 139a6e4f0b8f4f8623fa813a482f5d1e1bb07efa Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Aug 23 00:29:32 2014 +0200 Avoid x2gothinclient_init failures, use if..then..fi instead of the test command. --- debian/changelog | 2 ++ .../share/etc/x2gothinclient_init | 14 +++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2764c23..48ce978 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low - Run x2gothinclient_shell and x2gothinclient_upgrade with LANG=C. - Don't run x2gothinclient_init inside TCE chroot operations (x2gothinclient_shell or x2gothinclient_upgrade). + - Avoid x2gothinclient_init failures, use if..then..fi instead of + the test command. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Feb 2014 12:03:00 +0100 diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_init b/x2gothinclientmanagement/share/etc/x2gothinclient_init index 318ddd5..c898f12 100755 --- a/x2gothinclientmanagement/share/etc/x2gothinclient_init +++ b/x2gothinclientmanagement/share/etc/x2gothinclient_init @@ -23,9 +23,17 @@ if [ -z "$X2GO_HANDLE_DAEMON" ]; then mkdir -p ~x2gothinclient mkdir -p ~x2gothinclient/.x2goclient - test -e /etc/x2go/x2gothinclient_sessions && cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions - test -e /etc/x2go/freerdp/known_hosts && mkdir -p ~x2gothinclient/.freerdp && cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts - test -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop && mkdir -p ~x2gothinclient/Desktop && cp /etc/xdg/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ + if [ -e /etc/x2go/x2gothinclient_sessions ]; then + cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions + fi + if [ -e /etc/x2go/freerdp/known_hosts ]; then + mkdir -p ~x2gothinclient/.freerdp + cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts + fi + if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ]; then + mkdir -p ~x2gothinclient/Desktop + cp /etc/xdg/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ + fi mkdir -p ~x2gothinclient/.kde mkdir -p ~x2gothinclient/.kde/socket-`hostname` mkdir -p ~x2gothinclient/mounts -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org