x2go-commits

x2go-commits@lists.x2go.org

37910 discussions

x2goclient.git - master (branch) updated: 3.99.2.2-8-gb9e0f34
by git-admin＠x2go.org 04 Sep '12

04 Sep '12

The branch, master has been updated via b9e0f3498b4b681341f6bb4bfad28a64d2afee37 (commit) from 4adfcbf0aa5f34283089786032b47727530e5d78 (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 b9e0f3498b4b681341f6bb4bfad28a64d2afee37 Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Tue Sep 4 12:14:43 2012 +0200 Implement direct RDP connection using standalone client ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +- onmainwindow.cpp | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++- onmainwindow.h | 2 + sessionbutton.cpp | 35 +++++++++++-- settingswidget.cpp | 2 +- 5 files changed, 173 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 753b008..3dfcf1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (3.99.2.3-0~x2go2) UNRELEASED; urgency=low +x2goclient (3.99.2.3-0~x2go3) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (3.99.2.2): @@ -10,8 +10,9 @@ x2goclient (3.99.2.3-0~x2go2) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * Add settings for direct RDP connection + * Implement direct RDP connection using standalone client - -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 30 Aug 2012 18:10:57 +0300 + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Tue, 04 Sep 2012 12:13:43 +0200 x2goclient (3.99.2.2-0~x2go2) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 1bded10..7294d56 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -2950,6 +2950,7 @@ void ONMainWindow::slotSshUserAuthError ( QString error ) void ONMainWindow::slotSessEnter() { + if ( useLdap ) { slotPassEnter(); @@ -3005,10 +3006,102 @@ void ONMainWindow::continueLDAPSession() proc->startNormal ( "x2gogetservers" ); } +void ONMainWindow::startDirectRDP() +{ + + X2goSettings st ( "sessions" ); + QString sid; + if ( !embedMode ) + sid=lastSession->id(); + else + sid="embedded"; + + + bool fullscreen=st.setting()->value ( sid+"/fullscreen", + ( QVariant ) + defaultFullscreen ).toBool(); + bool maxRes=st.setting()->value ( sid+"/maxdim", + ( QVariant ) + false ).toBool(); + int height=st.setting()->value ( sid+"/height", + ( QVariant ) defaultHeight ).toInt(); + int width=st.setting()->value ( sid+"/width", + ( QVariant ) defaultWidth ).toInt(); + + QString client=st.setting()->value ( sid+"/rdpclient", + ( QVariant ) "rdesktop").toString(); + QString host=st.setting()->value ( sid+"/host", + ( QVariant ) "").toString(); + QString port=st.setting()->value ( sid+"/rdpport", + ( QVariant ) "3389").toString(); + QString params=st.setting()->value ( sid+"/directrdpsettings", + ( QVariant ) "").toString(); + QString user=login->text(); + QString password=pass->text(); + + nxproxy=new QProcess; + connect ( nxproxy,SIGNAL ( error ( QProcess::ProcessError ) ),this, + SLOT ( slotProxyError ( QProcess::ProcessError ) ) ); + connect ( nxproxy,SIGNAL ( finished ( int,QProcess::ExitStatus ) ),this, + SLOT ( slotProxyFinished ( int,QProcess::ExitStatus ) ) ); + connect ( nxproxy,SIGNAL ( readyReadStandardError() ),this, + SLOT ( slotProxyStderr() ) ); + connect ( nxproxy,SIGNAL ( readyReadStandardOutput() ),this, + SLOT ( slotProxyStdout() ) ); + + + QString userOpt; + if (user.length()>0) + { + userOpt=" -u "; + userOpt+=user+" "; + } + + QString passOpt; + if (password.length()>0) + { + passOpt=" -p \""; + passOpt+=password+"\" "; + } + + QString grOpt; + + if (fullscreen) + { + grOpt=" -f "; + } + else if (maxRes) + { + QDesktopWidget wd; + grOpt=" -D -g "+QString::number( wd.screenGeometry().width())+"x"+QString::number(wd.screenGeometry().height())+" "; + } + else + { + grOpt=" -g "+QString::number(width)+"x"+QString::number(height); + } + + QString proxyCmd=client +" "+params+ grOpt +userOpt+passOpt + host +":"+port ; + nxproxy->start ( proxyCmd ); + + resumingSession.display="RDP"; + resumingSession.server=host; + resumingSession.sessionId=lastSession->name(); + resumingSession.crTime=QDateTime::currentDateTime().toString("dd.MM.yy HH:mm:ss"); + + showSessionStatus(); +// QTimer::singleShot ( 30000,this,SLOT ( slotRestartProxy() ) ); + +} + + + + + bool ONMainWindow::startSession ( const QString& sid ) { setEnabled ( false ); + directRDP=false; QString passwd; QString user; QString host; @@ -3040,6 +3133,13 @@ bool ONMainWindow::startSession ( const QString& sid ) ( QVariant ) false ).toBool(); krblogin=st.setting()->value ( sid+"/krblogin", ( QVariant ) false ).toBool(); + directRDP=st.setting()->value ( sid+"/directrdp", + ( QVariant ) false ).toBool(); + if (cmd =="RDP" && directRDP) + { + startDirectRDP(); + return true; + } if ( cmd=="SHADOW" ) shadowSession=true; } @@ -4021,6 +4121,12 @@ void ONMainWindow::slotResumeSess() void ONMainWindow::slotSuspendSess() { + if (directRDP) + { + nxproxy->terminate(); + return; + } + QString passwd; QString user=getCurrentUname(); @@ -4069,6 +4175,12 @@ void ONMainWindow::slotSuspendSess() void ONMainWindow::slotSuspendSessFromSt() { + x2goDebug<<"suspend from st"; + if (directRDP) + { + nxproxy->terminate(); + return; + } QString passwd; QString user=getCurrentUname(); passwd=getCurrentPass(); @@ -4085,7 +4197,12 @@ void ONMainWindow::slotSuspendSessFromSt() void ONMainWindow::slotTermSessFromSt() { - + x2goDebug<<"term from st"; + if (directRDP) + { + nxproxy->terminate(); + return; + } /* x2goDebug <<"disconnect export"<<endl; disconnect ( sbExp,SIGNAL ( clicked() ),this, SLOT ( slot_exportDirectory() ) );*/ @@ -4147,6 +4264,13 @@ void ONMainWindow::slotRetSuspSess ( bool result, QString output, void ONMainWindow::slotTermSess() { + if (directRDP) + { + nxproxy->terminate(); + return; + } + + selectSessionDlg->setEnabled ( false ); @@ -4950,7 +5074,10 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) } } x2goDebug<<"nxproxy not running"<<endl; - delete nxproxy; + if (!directRDP) + delete nxproxy; + else + nxproxy=0; } #endif x2goDebug<<"proxy deleted"<<endl; @@ -4960,6 +5087,14 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) nxproxy=0l; proxyWinId=0; + if (directRDP) + { + pass->setText ( "" ); + QTimer::singleShot ( 2000,this, + SLOT ( slotShowPassForm() ) ); + return; + } + if ( !shadowSession && !usePGPCard && ! ( embedMode && ( config.checkexitstatus==false ) ) ) check_cmd_status(); diff --git a/onmainwindow.h b/onmainwindow.h index 2d75273..2fadcfd 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -670,6 +670,7 @@ private: bool ldapOnly; bool isScDaemonOk; bool parecTunnelOk; + bool directRDP; bool startSessSound; @@ -1027,6 +1028,7 @@ private: void printSshDError(); void loadPulseModuleNativeProtocol(); void initEmbedToolBar(); + void startDirectRDP(); bool isServerRunning ( int port ); void filterDesktops ( const QString& filter, bool strict=false ); diff --git a/sessionbutton.cpp b/sessionbutton.cpp index f53d82a..4ece426 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -345,6 +345,7 @@ void SessionButton::redraw() cmdBox->addItems ( par->transApplicationsNames() ); + bool directRDP=false; QPixmap cmdpix; if ( command=="KDE" ) { @@ -374,6 +375,9 @@ void SessionButton::redraw() } else if ( command =="RDP" ) { + if (st->setting()->value ( sid+"/directrdp", + ( QVariant ) false ).toBool()) + directRDP=true; cmdpix.load ( par->iconsPath ( "/16x16/rdp.png" ) ); cmdBox->setCurrentIndex ( RDP ); command=tr ( "RDP connection" ); @@ -413,10 +417,11 @@ void SessionButton::redraw() geomBox->clear(); geomBox->addItem ( tr ( "fullscreen" ) ); uint displays=QApplication::desktop()->numScreens(); - for (uint i=0;i<displays;++i) - { - geomBox->addItem ( tr( "Display " )+QString::number(i+1)); - } + if (!directRDP) + for (uint i=0;i<displays;++i) + { + geomBox->addItem ( tr( "Display " )+QString::number(i+1)); + } #ifndef Q_WS_HILDON geomBox->addItem ( "1440x900" ); geomBox->addItem ( "1280x1024" ); @@ -432,7 +437,7 @@ void SessionButton::redraw() } else if (st->setting()->value ( sid+"/multidisp", - ( QVariant ) false ).toBool()) + ( QVariant ) false ).toBool() && !directRDP) { uint disp=st->setting()->value ( sid+"/display", ( QVariant ) 1 ).toUInt(); @@ -468,6 +473,17 @@ void SessionButton::redraw() #endif } + if (directRDP) + { + geomBox->addItem ( tr("Maximum") ); + if (st->setting()->value ( sid+"/maxdim", + ( QVariant ) false ).toBool()) + { + geom->setText ( tr("Maximum") ); + geomBox->setCurrentIndex ( geomBox->findText ( tr("Maximum") )); + } + } + snd=st->setting()->value ( sid+"/sound", ( QVariant ) true ).toBool(); if ( snd ) @@ -710,6 +726,13 @@ void SessionButton::slot_geom_change ( const QString& new_g ) { st.setting()->setValue ( sid+"/fullscreen", ( QVariant ) true ); st.setting()->setValue ( sid+"/multidisp", ( QVariant ) false ); + st.setting()->setValue ( sid+"/maxdim", ( QVariant ) false ); + } + else if ( new_g==tr ( "Maximum" )) + { + st.setting()->setValue ( sid+"/fullscreen", ( QVariant ) false ); + st.setting()->setValue ( sid+"/multidisp", ( QVariant ) false ); + st.setting()->setValue ( sid+"/maxdim", ( QVariant ) true ); } else if (new_g.indexOf(tr("Display "))==0) @@ -719,6 +742,7 @@ void SessionButton::slot_geom_change ( const QString& new_g ) st.setting()->setValue ( sid+"/multidisp", ( QVariant ) true ); st.setting()->setValue ( sid+"/display", ( QVariant ) g.toUInt()); st.setting()->setValue ( sid+"/fullscreen", ( QVariant ) false ); + st.setting()->setValue ( sid+"/maxdim", ( QVariant ) false ); } else { @@ -728,6 +752,7 @@ void SessionButton::slot_geom_change ( const QString& new_g ) #endif st.setting()->setValue ( sid+"/fullscreen", ( QVariant ) false ); st.setting()->setValue ( sid+"/multidisp", ( QVariant ) false ); + st.setting()->setValue ( sid+"/maxdim", ( QVariant ) false ); QStringList lst=new_geom.split ( 'x' ); st.setting()->setValue ( sid+"/width", ( QVariant ) lst[0] ); st.setting()->setValue ( sid+"/height", ( QVariant ) lst[1] ); diff --git a/settingswidget.cpp b/settingswidget.cpp index 5439059..2529a76 100644 --- a/settingswidget.cpp +++ b/settingswidget.cpp @@ -739,7 +739,7 @@ void SettingsWidget::updateCmdLine() } if (maxRes->isChecked()) { - grOpt=" -g <maxW>x<maxH>"; + grOpt=" -D -g <maxW>x<maxH>"; } if (custom->isChecked()) { hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.8-30-g9e756ed
by git-admin＠x2go.org 03 Sep '12

03 Sep '12

The branch, master has been updated via 9e756ed8695081abd79ff484e0e9dc4fc675b8de (commit) from 60d6d46001c3910b2279da48ddc6cc224cd4a60a (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 9e756ed8695081abd79ff484e0e9dc4fc675b8de Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 3 22:41:52 2012 +0200 Provide /dev/pts inside chroot. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 5 +++-- x2gothinclientmanagement/sbin/x2gothinclient_shell | 5 +++-- .../sbin/x2gothinclient_upgrade | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0004817..8b26b4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Keep mounts for /proc and /dev/pts with option noauto for mounting inside of chroot. They are not needed during TCE boot. - Make the SSH daemon listen on IPv4 localhost address only. + - Provide /dev/pts inside chroot. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index bd94944..41c335b 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -194,13 +194,14 @@ export X2GO_HANDLE_DAEMONS=false EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh -mkdir -p $TC_CHROOT/{proc,dev,sys} +mkdir -p $TC_CHROOT/{proc,dev/pts,sys} mount -tproc proc $TC_CHROOT/proc || true mount -tsysfs sys $TC_CHROOT/sys || true +mount -tdevpts devpts $TC_CHROOT/dev/pts || true chroot $TC_CHROOT /x2go_tce_install.sh -for mountpoint in proc dev sys; do +for mountpoint in proc dev/pts sys; do while true; do cat /proc/mounts | grep $TC_CHROOT/$mountpoint >/dev/null && umount $TC_CHROOT/$mountpoint || break done diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 7b2d347..0ecb1aa 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -95,13 +95,14 @@ echo EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" -mkdir -p $TC_CHROOT/{proc,dev,sys} +mkdir -p $TC_CHROOT/{proc,dev/pts,sys} mount -tproc proc $TC_CHROOT/proc || true mount -tsysfs sys $TC_CHROOT/sys || true +mount -tdevts devts $TC_CHROOT/dev/pts || true chroot "$TC_CHROOT" /x2go_tce_shell.sh -for mountpoint in proc dev sys; do +for mountpoint in proc dev/pts sys; do while true; do cat /proc/mounts | grep $TC_CHROOT/$mountpoint >/dev/null && umount $TC_CHROOT/$mountpoint || break done diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 9268cda..acd9a5b 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -94,13 +94,14 @@ echo EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" -mkdir -p $TC_CHROOT/{proc,dev,sys} +mkdir -p $TC_CHROOT/{proc,dev/pts,sys} mount -tproc proc $TC_CHROOT/proc || true mount -tsysfs sys $TC_CHROOT/sys || true +mount -tdevpts devpts $TC_CHROOT/dev/pts || true chroot "$TC_CHROOT" /x2go_tce_upgrade.sh -for mountpoint in proc dev sys; do +for mountpoint in proc dev/pts sys; do while true; do cat /proc/mounts | grep $TC_CHROOT/$mountpoint >/dev/null && umount $TC_CHROOT/$mountpoint || break done 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.0.1.8-29-g60d6d46
by git-admin＠x2go.org 03 Sep '12

03 Sep '12

The branch, master has been updated via 60d6d46001c3910b2279da48ddc6cc224cd4a60a (commit) via 77b5ffcb41a8b6d481af2ab8676986ee63091b2a (commit) via 7d0ae5ee46b503a3fb7a1ac1053376b92a1fe77d (commit) from e495654fd55021e8818cbc2f7710bf8ab6d9d013 (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 60d6d46001c3910b2279da48ddc6cc224cd4a60a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 3 22:30:28 2012 +0200 whitespace fix commit 77b5ffcb41a8b6d481af2ab8676986ee63091b2a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 3 22:23:52 2012 +0200 Make the SSH daemon listen on IPv4 localhost address only. commit 7d0ae5ee46b503a3fb7a1ac1053376b92a1fe77d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 3 22:13:01 2012 +0200 Keep mounts for /proc and /dev/pts with option noauto for mounting inside of chroot. They are not needed during TCE boot. ----------------------------------------------------------------------- Summary of changes: README.howto | 3 ++- debian/changelog | 3 +++ .../sbin/x2gothinclient_create | 6 ++++-- 3 files changed, 9 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/README.howto b/README.howto index ed9eac0..11d4e8d 100644 --- a/README.howto +++ b/README.howto @@ -5,4 +5,5 @@ A detailled installation description is available in the X2Go Wiki: http://wiki.x2go.org/doku.php/wiki:components:tce light+love, -Mike Gabriel \ No newline at end of file +Mike Gabriel + diff --git a/debian/changelog b/debian/changelog index 9500ff0..0004817 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Make sure that kernel + initrd symlinks are relative symlinks. - Remove /etc/hostname, whithout the file, the hostname gets set during PXE boot. + - Keep mounts for /proc and /dev/pts with option noauto for mounting inside + of chroot. They are not needed during TCE boot. + - Make the SSH daemon listen on IPv4 localhost address only. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index b546b4a..bd94944 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -86,7 +86,8 @@ echo "x2gothinclient" > $TC_CHROOT/etc/hostname echo "127.0.0.1 localhost" >> $TC_CHROOT/etc/hosts cat > $TC_CHROOT/etc/fstab <<EOF -proc /proc proc defaults 0 0 +proc /proc proc defaults,noauto 0 0 +none /dev/pts devpts gid=5,mode=620,noauto 0 0 none /tmp tmpfs size=50M,mode=1777 0 0 none /root tmpfs size=100M,mode=700 0 0 none /etc/udev/rules.d tmpfs size=50M 0 0 @@ -104,7 +105,6 @@ if [ "$TC_DISTRO_CODENAME" = "squeeze" ]; then cat >> $TC_CHROOT/etc/fstab <<EOF none /var/run tmpfs size=50M 0 0 none /var/lock tmpfs size=50M 0 0 -none /dev/pts devpts gid=5,mode=620 0 0 EOF elif [ "$TC_DISTRO_CODENAME" = "wheezy" ]; then cat >> $TC_CHROOT/etc/fstab <<EOF @@ -184,6 +184,8 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -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 + # tweak plymouth [ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release [ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf 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.0.1.8-26-ge495654
by git-admin＠x2go.org 03 Sep '12

03 Sep '12

The branch, master has been updated via e495654fd55021e8818cbc2f7710bf8ab6d9d013 (commit) from 2e41eb4c545fb1e8c6209c4ed21dfa6ae68d8607 (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 e495654fd55021e8818cbc2f7710bf8ab6d9d013 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 3 22:06:35 2012 +0200 fix modesetting for i915 and radeon chipsets ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 5941e21..b546b4a 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -186,8 +186,8 @@ export X2GO_HANDLE_DAEMONS=false # tweak plymouth [ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release -[ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/nomodeset/' -i /etc/modprobe.d/i915-kms.conf -[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/nomodeset/' -i /etc/modprobe.d/radeon-kms.conf +[ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf +[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh 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.0.1.8-25-g2e41eb4
by git-admin＠x2go.org 03 Sep '12

03 Sep '12

The branch, master has been updated via 2e41eb4c545fb1e8c6209c4ed21dfa6ae68d8607 (commit) from 3e2b724b3c476b645b88bb6b0c59a26486b73136 (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 2e41eb4c545fb1e8c6209c4ed21dfa6ae68d8607 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 3 22:02:55 2012 +0200 Remove /etc/hostname, whithout the file, the hostname gets set during PXE boot. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ .../sbin/x2gothinclient_create | 1 + x2gothinclientmanagement/sbin/x2gothinclient_shell | 3 +++ .../sbin/x2gothinclient_upgrade | 3 +++ 4 files changed, 9 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index edc2342..9500ff0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low we only find a 686-pae kernel which fails on some (virtual) hardware (e.g. virtualbox). - Make sure that kernel + initrd symlinks are relative symlinks. + - Remove /etc/hostname, whithout the file, the hostname gets set during PXE + boot. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 8e14e6b..5941e21 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -161,6 +161,7 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -s \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp [ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y +[ \$? -eq 0 ] && rm -f /etc/hostname # blacklist kernel modules [ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 89cbbcf..7b2d347 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -78,6 +78,9 @@ if [ \$(stat --format '%s' /sbin/start-stop-daemon) -gt 200 ]; then chmod a+x /sbin/start-stop-daemon fi +# make sure the /etc/hostname file is not presented in the chroot +[ -e /etc/hostname ] && rm -f /etc/hostname + export X2GO_HANDLE_DAEMONS=false mount /root diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index f0c0307..9268cda 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -68,6 +68,9 @@ if [ \$(stat --format '%s' /sbin/start-stop-daemon) -gt 200 ]; then chmod a+x /sbin/start-stop-daemon fi +# make sure the /etc/hostname file is not presented in the chroot +[ -e /etc/hostname ] && rm -f /etc/hostname + export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get update 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.0.1.8-24-g3e2b724
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 3e2b724b3c476b645b88bb6b0c59a26486b73136 (commit) from 3d032b2f626d8d7873472c79ab60b2bb028db838 (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 3e2b724b3c476b645b88bb6b0c59a26486b73136 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 22:54:06 2012 +0200 Make sure that kernel + initrd symlinks are relative symlinks. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 15e5181..edc2342 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Drop i686 kernel support, use i486 kernel by default. In Debian wheezy we only find a 686-pae kernel which fails on some (virtual) hardware (e.g. virtualbox). + - Make sure that kernel + initrd symlinks are relative symlinks. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index d05cbf8..8e14e6b 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -155,8 +155,11 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install syslinux locales -y [ \$? -eq 0 ] && dpkg-reconfigure locales [ \$? -eq 0 ] && apt-get install linux-image-486 -y -[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486 -[ \$? -eq 0 ] && mv /initrd.img /initrd.img.486 +[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486.tmp +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot@boot@') && ln -s \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp +[ \$? -eq 0 ] && mv /initrd.img /initrd.img.486.tmp +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -s \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp + [ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y # blacklist kernel modules 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.0.1.8-23-g3d032b2
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 3d032b2f626d8d7873472c79ab60b2bb028db838 (commit) from 1692e917cc85ab932aed7c2069b6a24972dc0ca6 (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 3d032b2f626d8d7873472c79ab60b2bb028db838 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 22:39:29 2012 +0200 Do not fail if proc or sysfs are already mounted within chroot. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 4 ++-- x2gothinclientmanagement/sbin/x2gothinclient_shell | 4 ++-- .../sbin/x2gothinclient_upgrade | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1ed0798..15e5181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low entry. - Mount proc and sysfs from outside chroot, cleanly unmount both in case there are more than one mountpoints for sysfs or proc mounted. + - Do not fail if proc or sysfs are already mounted within chroot. - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) while thin clients are in use. - Disable kms for radeon and i915 graphics adapters. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 0aa9cb8..d05cbf8 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -189,8 +189,8 @@ EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh mkdir -p $TC_CHROOT/{proc,dev,sys} -mount -tproc proc $TC_CHROOT/proc -mount -tsysfs sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc || true +mount -tsysfs sys $TC_CHROOT/sys || true chroot $TC_CHROOT /x2go_tce_install.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index ae6b55e..89cbbcf 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -93,8 +93,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount -tproc proc $TC_CHROOT/proc -mount -tsysfs sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc || true +mount -tsysfs sys $TC_CHROOT/sys || true chroot "$TC_CHROOT" /x2go_tce_shell.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 2050c9e..f0c0307 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -92,8 +92,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount -tproc proc $TC_CHROOT/proc -mount -tsysfs sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc || true +mount -tsysfs sys $TC_CHROOT/sys || true chroot "$TC_CHROOT" /x2go_tce_upgrade.sh 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.0.1.8-22-g1692e91
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 1692e917cc85ab932aed7c2069b6a24972dc0ca6 (commit) from 65d460e62294a2ee9b27dfd6f2b8abd518596833 (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 1692e917cc85ab932aed7c2069b6a24972dc0ca6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 22:24:09 2012 +0200 Drop i686 kernel support, use i486 kernel by default. In Debian wheezy we only find a 686-pae kernel which fails on some (virtual) hardware (e.g. virtualbox). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ .../sbin/x2gothinclient_create | 3 --- .../share/tftpboot/x2go-tce.cfg | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4bf2668..1ed0798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - x2gothinclient_shell now does not affect boot behavious of the TCE machines anymore, thus, removing the notification output when launching the X2Go TCE maintenance shell. + - Drop i686 kernel support, use i486 kernel by default. In Debian wheezy + we only find a 686-pae kernel which fails on some (virtual) hardware (e.g. + virtualbox). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 378672b..0aa9cb8 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -157,9 +157,6 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install linux-image-486 -y [ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486 [ \$? -eq 0 ] && mv /initrd.img /initrd.img.486 -[ \$? -eq 0 ] && apt-get install linux-image-686 -y -[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.686 -[ \$? -eq 0 ] && mv /initrd.img /initrd.img.686 [ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y # blacklist kernel modules diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg index 9d38f11..c1f0b3a 100644 --- a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg +++ b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg @@ -1,8 +1,4 @@ -LABEL x2go-tce-686 +LABEL x2go-tce-486 MENU LABEL X2Go ^Thin Client - KERNEL vmlinuz.686 - APPEND initrd=initrd.img.686 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset -LABEL x2go-tce-486 - MENU LABEL X2Go ^Thin Client (old hardware) KERNEL vmlinuz.486 - APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset + APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash 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.0.1.8-21-g65d460e
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 65d460e62294a2ee9b27dfd6f2b8abd518596833 (commit) from 61ef5f76438f263442d41ba3e8cff8725b4dfcca (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 65d460e62294a2ee9b27dfd6f2b8abd518596833 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 22:20:30 2012 +0200 Mount proc and sysfs from outside chroot, cleanly unmount both in case there are more than one mountpoints for sysfs or proc mounted. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- .../sbin/x2gothinclient_create | 5 ++--- x2gothinclientmanagement/sbin/x2gothinclient_shell | 9 ++++++--- .../sbin/x2gothinclient_upgrade | 5 ++--- 4 files changed, 12 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0988afa..4bf2668 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low got relocated to /run). - /etc/network/interfaces in wheezy already contains a loopback device entry. - - Cleanly unmount --bind mounts in case there are more than one. + - Mount proc and sysfs from outside chroot, cleanly unmount both in case + there are more than one mountpoints for sysfs or proc mounted. - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) while thin clients are in use. - Disable kms for radeon and i915 graphics adapters. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 22ade73..378672b 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -192,9 +192,8 @@ EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh mkdir -p $TC_CHROOT/{proc,dev,sys} -mount --bind /proc $TC_CHROOT/proc -mount --bind /dev $TC_CHROOT/dev -mount --bind /sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc +mount -tsysfs sys $TC_CHROOT/sys chroot $TC_CHROOT /x2go_tce_install.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 974d966..ae6b55e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -80,8 +80,12 @@ fi export X2GO_HANDLE_DAEMONS=false +mount /root + /bin/$TC_SHELL +umount /root + echo echo "X2go Thin Client Shell has exited." echo @@ -89,9 +93,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount --bind /proc $TC_CHROOT/proc -mount --bind /dev $TC_CHROOT/dev -mount --bind /sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc +mount -tsysfs sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_shell.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 218b4b9..2050c9e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -92,9 +92,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount --bind /proc $TC_CHROOT/proc -mount --bind /dev $TC_CHROOT/dev -mount --bind /sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc +mount -tsysfs sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_upgrade.sh 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.0.1.8-20-g61ef5f7
by git-admin＠x2go.org 02 Sep '12

02 Sep '12

The branch, master has been updated via 61ef5f76438f263442d41ba3e8cff8725b4dfcca (commit) from 779013fd2592efb947dbdc598e647809728c44a1 (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 61ef5f76438f263442d41ba3e8cff8725b4dfcca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 2 21:33:28 2012 +0200 x2gothinclient_shell now does not affect boot behavious of the TCE machines anymore, thus, removing the notification output when launching the X2Go TCE maintenance shell. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a0e4bfc..0988afa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) while thin clients are in use. - Disable kms for radeon and i915 graphics adapters. + - x2gothinclient_shell now does not affect boot behavious of the TCE + machines anymore, thus, removing the notification output when + launching the X2Go TCE maintenance shell. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 9dfeaaa..974d966 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -63,8 +63,6 @@ echo echo "To return from this chroot shell hit STRG+D or type ,,exit'' on the" echo 'command line...' echo -echo 'Note: Service restarts have been disabled in X2Go TCE chroot.' -echo # migrate start-stop-daemon to wrapper & variable based start-stop-daemon execution if [ \$(stat --format '%s' /sbin/start-stop-daemon) -gt 200 ]; then 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits