x2go-commits November 2013

x2go-commits@lists.x2go.org

2 participants
391 discussions

pyhoca-gui.git - master (branch) updated: 0.4.0.8-24-gf9a2213
by git-admin＠x2go.org 15 Nov '13

15 Nov '13

The branch, master has been updated via f9a2213d9066df3130a958276ab922055e0475c3 (commit) from 14b4e4ab4882ba30bceeed2701909b4de837451b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f9a2213d9066df3130a958276ab922055e0475c3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 15 22:19:14 2013 +0100 Resolve tilde char in file path of the splash image. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/splash.py | 3 +++ 2 files changed, 4 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 05fb004..db0c42d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Allow for full path about image icon names, resolve tilde char in icon file path. - Resolve tilde char in file path of the about image. + - Resolve tilde char in file path of the splash image. - Allow multiple PyHoca-GUI instances for the same user, one per $DISPLAY. - Resolve tilde char in base directories for the PyHoca-GUI application. * /debian/copyright: diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py index adb353c..fb8744d 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -47,6 +47,9 @@ class PyHocaGUI_SplashScreen(wx.SplashScreen): @type splash_image: C{str} """ + if splash_image: + splash_image = os.path.expanduser(splash_image) + if splash_image and os.path.basename(splash_image) == splash_image: splash_image = os.path.join(basepath.images_basepath, splash_image) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.8-16-g573ccd6
by git-admin＠x2go.org 15 Nov '13

15 Nov '13

The branch, master has been updated via 573ccd612a537b0e7c30f537051880dcd6bc0b08 (commit) from c7c9cb77bd436b75d2dc6d35ac3172c011304abb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 573ccd612a537b0e7c30f537051880dcd6bc0b08 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 15 12:06:58 2013 +0100 Allow for full path taskbar icon names, resolve tilde char in icon file path. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/taskbar.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 133e4e6..32e3a61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Become aware of new Python X2Go hook method (HOOK_desktop_sharing_denied). - Connect to sharable desktop session when selecting the session display with double click from the list of available desktop sessions. + - Allow for full path taskbar icon names, resolve tilde char in icon file + path. * /debian/copyright: + Update file. Add entry for file icon2exe.py. * /debian/control: diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index dad25b4..5b82260 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -71,7 +71,13 @@ def MakeIcon(icon_name, fallback_name='pyhoca-trayicon'): if icon_name is None: icon_name = fallback_name - icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, icon_name) + icon_name = os.path.expanduser(icon_name) + if not icon_name.lower().endswith('.png'): + icon_name = '%s.png' % icon_name + + if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))): + icon_file = '%s/PyHoca/%s/%s' % (_icons_location, icon_size, icon_name) + if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))): icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, fallback_name) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.8-17-g623aa9c
by git-admin＠x2go.org 15 Nov '13

15 Nov '13

The branch, master has been updated via 623aa9ca6623ee269e78ebb4f9ed67aa4ce0e299 (commit) from 573ccd612a537b0e7c30f537051880dcd6bc0b08 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 623aa9ca6623ee269e78ebb4f9ed67aa4ce0e299 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 15 12:10:07 2013 +0100 Resolve tilde char in file path of the about image. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/about.py | 2 ++ 2 files changed, 3 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 32e3a61..9a35bd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low with double click from the list of available desktop sessions. - Allow for full path taskbar icon names, resolve tilde char in icon file path. + - Resolve tilde char in file path of the about image. * /debian/copyright: + Update file. Add entry for file icon2exe.py. * /debian/control: diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index db5bf55..f6b67b0 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -70,6 +70,8 @@ class PyHocaGUI_AboutFrame(wx.Frame): if about_image is None: about_image = fallback_about_image + about_image = os.path.expanduser(about_image) + if os.path.basename(about_image) == about_image: about_image = os.path.join(basepath.images_basepath, about_image) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.8-18-gb9235e3
by git-admin＠x2go.org 15 Nov '13

15 Nov '13

The branch, master has been updated via b9235e33ca5e7429607fe0b66ad395a444940147 (commit) from 623aa9ca6623ee269e78ebb4f9ed67aa4ce0e299 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b9235e33ca5e7429607fe0b66ad395a444940147 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 15 12:10:34 2013 +0100 fix default icon name in PyHoca_AboutFrame class constructor ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/about.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index f6b67b0..1343599 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -46,7 +46,7 @@ class PyHocaGUI_AboutFrame(wx.Frame): wxWidget displaying an ,,About'' window for this application. """ - def __init__(self, _PyHocaGUI, caller=None, about_image=None, icon_name='pyhoca-winicon.png', about_what=None, ): + def __init__(self, _PyHocaGUI, caller=None, about_image=None, icon_name='pyhoca-winicon', about_what=None, ): """\ About window (constructor). hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.8-20-gc062109
by git-admin＠x2go.org 15 Nov '13

15 Nov '13

The branch, master has been updated via c0621096c422cdb8931c717a05ac304c2bacf93c (commit) from 9394bb354a9dafb685a3f0caef642e011f463726 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c0621096c422cdb8931c717a05ac304c2bacf93c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 15 21:59:33 2013 +0100 fix for commit 623aa9c ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/taskbar.py | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index 5b82260..5728ca7 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -75,6 +75,7 @@ def MakeIcon(icon_name, fallback_name='pyhoca-trayicon'): if not icon_name.lower().endswith('.png'): icon_name = '%s.png' % icon_name + icon_file = icon_name if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))): icon_file = '%s/PyHoca/%s/%s' % (_icons_location, icon_size, icon_name) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.8-21-gfc15db6
by git-admin＠x2go.org 15 Nov '13

15 Nov '13

The branch, master has been updated via fc15db627d8ad3232979a469dde294b572318a47 (commit) from c0621096c422cdb8931c717a05ac304c2bacf93c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fc15db627d8ad3232979a469dde294b572318a47 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 15 22:04:23 2013 +0100 Allow for full path about image icon names, resolve tilde char in icon file path. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/about.py | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3727545..aba2997 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low with double click from the list of available desktop sessions. - Allow for full path taskbar icon names, resolve tilde char in icon file path. + - Allow for full path about image icon names, resolve tilde char in icon + file path. - Resolve tilde char in file path of the about image. - Allow multiple PyHoca-GUI instances for the same user, one per $DISPLAY. * /debian/copyright: diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index 1343599..eae5413 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -105,7 +105,14 @@ class PyHocaGUI_AboutFrame(wx.Frame): elif "wxMAC" in wx.PlatformInfo: icon_size = '128x128' - icon_file = os.path.normpath('%s/PyHoca/%s/%s.png' % (basepath.icons_basepath, icon_size, icon_name)) + icon_name = os.path.expanduser(icon_name) + if not icon_name.lower().endswith('.png'): + icon_name = '%s.png' % icon_name + + icon_file = icon_name + if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))): + icon_file = '%s/PyHoca/%s/%s' % (basepath.icons_basepath, icon_size, icon_name) + if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))): icon_file = os.path.normpath('%s/PyHoca/%s/%s.png' % (basepath.icons_basepath, icon_size, 'pyhoca-winicon')) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.8-19-g9394bb3
by git-admin＠x2go.org 15 Nov '13

15 Nov '13

The branch, master has been updated via 9394bb354a9dafb685a3f0caef642e011f463726 (commit) from b9235e33ca5e7429607fe0b66ad395a444940147 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9394bb354a9dafb685a3f0caef642e011f463726 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 15 21:58:41 2013 +0100 Allow multiple PyHoca-GUI instances for the same user, one per :0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca-gui | 62 ++++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 47 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9a35bd8..3727545 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Allow for full path taskbar icon names, resolve tilde char in icon file path. - Resolve tilde char in file path of the about image. + - Allow multiple PyHoca-GUI instances for the same user, one per $DISPLAY. * /debian/copyright: + Update file. Add entry for file icon2exe.py. * /debian/control: diff --git a/pyhoca-gui b/pyhoca-gui index 34f08b4..1697f86 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -24,6 +24,7 @@ modules ={} import sys import os import re +import shutil PROG_NAME = os.path.basename(sys.argv[0]).replace('.exe', '') PROG_PID = os.getpid() @@ -138,25 +139,40 @@ VERSION: %s def check_running(): if _X2GOCLIENT_OS in ('Linux', 'Mac'): + p = subprocess.Popen(['ps', '-U', _CURRENT_LOCAL_USER, '-u', _CURRENT_LOCAL_USER], stdout=subprocess.PIPE) psA_out = p.communicate() if psA_out[0].count(PROG_NAME) <= 1: - return False - else: - processes = psA_out[0].strip().strip('\n').strip().split('\n') - sep = re.compile('[\s]+') - processes_of_myself = [ sep.split(row) for row in processes if PROG_NAME in row and not str(PROG_PID) in row ] - print - print 'FIXME: We found at least one other PyHoca-GUI instance for this user,' - print 'but cannot (yet) tell if it/they is/are running on the same $DISPLAY' - print 'or some other $DISPLAY. PyHoca-GUI only allows one instance per $DISPLAY.' - print - print 'These are the other instances of PyHoca-GUI found for this user:' - for line in processes_of_myself: - print " ".join(line) - # FIXME: add $DISPLAY check here, only return False if no PyHoca-GUI instance is running on this $DISPLAY - # return False - return True + + if os.path.isdir(os.path.expanduser("~/.x2go/pyhoca-gui/")): + shutil.rmtree(os.path.expanduser("~/.x2go/pyhoca-gui/")) + + my_pid = str(os.getpid()) + if not os.path.exists(os.path.expanduser("~/.x2go/pyhoca-gui/")): + os.makedirs(os.path.expanduser("~/.x2go/pyhoca-gui/")) + my_pidfile = os.path.expanduser("~/.x2go/pyhoca-gui/display.{pid}".format(pid=my_pid)) + + my_display = os.environ['DISPLAY'] + open(my_pidfile, 'w').write(my_display) + + already_running_for_this_display = False + for pidfile in os.listdir(os.path.expanduser("~/.x2go/pyhoca-gui/")): + + # this is our own pid file... + if my_pidfile.endswith(pidfile): + continue + + display = open(os.path.expanduser("~/.x2go/pyhoca-gui/") + pidfile, 'r').read() + + if display.split('.')[0] == my_display.split('.')[0]: + other_pid = pidfile.split('.')[1] + print + print('One instance of PyHoca-GUI (PID: {other_pid}) is already running for this $DISPLAY {display}'.format(other_pid=other_pid, display=my_display)) + + return True + + return False + elif _X2GOCLIENT_OS == 'Windows': import wmi w = wmi.WMI() @@ -169,6 +185,8 @@ def check_running(): def version(): # print version text and exit sys.stderr.write ("%s\n" % VERSION_TEXT) + remove_pidfile() + sys.exit(0) @@ -180,6 +198,8 @@ def runtime_error(m, parser=None, exitcode=-1): if parser is not None: parser.print_usage() sys.stderr.write ("%s: error: %s\n" % (PROG_NAME, m)) + + remove_pidfile() sys.exit(exitcode) @@ -272,6 +292,14 @@ portable_options = [ ] +def remove_pidfile(): + + if _X2GOCLIENT_OS in ('Linux', 'Mac'): + my_pid = str(os.getpid()) + if os.path.exists(os.path.expanduser("~/.x2go/pyhoca-gui/display.{pid}".format(pid=my_pid))): + os.remove(os.path.expanduser("~/.x2go/pyhoca-gui/display.{pid}".format(pid=my_pid))) + + def parseargs(): global DEBUG @@ -389,6 +417,8 @@ def main(): thisPyHocaGUI.WakeUpIdle() thisPyHocaGUI.ExitMainLoop() + remove_pidfile() + if __name__ == '__main__': main() hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-233-ge624ebc
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via e624ebc4909db5813271b07e9544cd3474ead94e (commit) from a7e839f2e04cdae838d11d13f1c8f833e0c1c665 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e624ebc4909db5813271b07e9544cd3474ead94e Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Thu Nov 14 18:12:38 2013 +0100 fixed x2goruncommand * New upstream version (4.1.0.0): - fixed x2goruncommand: "type -P $cmd" can create new lines in EXEC variable if command have the arguments wich have same names as existing commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl". Now we splitting $cmd and taking only first part. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2goserver/bin/x2goruncommand | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e2a7985..0abc0b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,13 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.1.0.0): - Use new script x2gopath in Perl::API. (Fixes: #86). + [ Oleksandr Shneyder ] + * New upstream version (4.1.0.0): + - fixed x2goruncommand: "type -P $cmd" can create new lines in EXEC + variable if command have the arguments wich have same names as existing + commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl". + Now we splitting $cmd and taking only first part. + -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 7dcc7fb..7cc8f84 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -194,7 +194,8 @@ if [ "$cmd" == "TERMINAL" ]; then fi fi -EXEC=`type -P $cmd` +WCMD=`echo $cmd | cut -d " " -f 1` +EXEC=`type -P $WCMD` EXEC_WRAPPER="" BNAME=`basename "$EXEC"` hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-29-g7399e80
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via 7399e80bd8181c79b16d80a6c2213619dfe2ff87 (commit) from e8ee22f9cf5b2762a9bcc0df462db979f9bd9fe3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7399e80bd8181c79b16d80a6c2213619dfe2ff87 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 14 16:32:54 2013 +0100 Do not over-mount /run as tmpfs. This is already done by the Debian boot process. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ .../sbin/x2gothinclient_create | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9caf83a..7d613da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low handle it, yet. Use "~" instead (handable by X2Go Client >= 4.0.1.2). - Tweak the /etc/os-release more comprehensively. - Update initramfs at the very end of the TCE creation. + - Do not over-mount /run as tmpfs. This is already done by the Debian + boot process. * debian/control: + New bin:package x2gothinclient-chroot. + Make sure x2gothinclient-chroot pulls in editing tools like diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index b5889fe..c59e062 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -120,10 +120,6 @@ if [ "$TC_DISTRO_CODENAME" = "squeeze" ]; then none /var/run tmpfs size=50M 0 0 none /var/lock tmpfs size=50M 0 0 EOF -elif [ "$TC_DISTRO_CODENAME" = "wheezy" ]; then - cat >> $TC_CHROOT/etc/fstab <<EOF -none /run tmpfs size=50M 0 0 -EOF fi cat > $TC_CHROOT/x2go_tce_install.sh <<EOF hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-28-ge8ee22f
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via e8ee22f9cf5b2762a9bcc0df462db979f9bd9fe3 (commit) from 1beb2c19571c775d3b89a13a7398f433ea175749 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e8ee22f9cf5b2762a9bcc0df462db979f9bd9fe3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 14 16:15:37 2013 +0100 Update initramfs at the very end of the TCE creation. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 99e369f..9caf83a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low - Refrain from using "~<user>" when launching X2Go Client as it cannot handle it, yet. Use "~" instead (handable by X2Go Client >= 4.0.1.2). - Tweak the /etc/os-release more comprehensively. + - Update initramfs at the very end of the TCE creation. * debian/control: + New bin:package x2gothinclient-chroot. + Make sure x2gothinclient-chroot pulls in editing tools like diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 0f88f44..b5889fe 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -198,7 +198,6 @@ fi [ \$? -eq 0 ] && adduser x2gothinclient plugdev [ \$? -eq 0 ] && if ! getent group scard; then groupadd scard; fi [ \$? -eq 0 ] && adduser x2gothinclient scard -[ \$? -eq 0 ] && update-initramfs -u -v [ \$? -eq 0 ] && passwd -l root [ \$? -eq 0 ] && sed -e 's/#ListenAddress ::/AddressFamily inet\nListenAddress 127.0.0.1/' -i /etc/ssh/sshd_config @@ -218,6 +217,9 @@ fi [ \$? -eq 0 ] && test -e /etc/init.d/alsa-utils && sed "s/^ALSACTLHOME=/export ALSACTLHOME=/" -i /etc/init.d/alsa-utils || true [ \$? -eq 0 ] && test -e /usr/share/alsa/utils.sh && sed "s/amixer \\\$CARDOPT/HOME=\\\$ALSACTLHOME amixer \\\$CARDOPT/g" -i /usr/share/alsa/utils.sh || true +# update all (mostly only one) initrd.img files +[ \$? -eq 0 ] && update-initramfs -u -v -k all + [ \$? -eq 0 ] && apt-get clean EOF hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2013