[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.8-8-gc325184
X2Go dev team
git-admin at x2go.org
Fri Jul 19 23:38:06 CEST 2013
The branch, build-main has been updated
via c325184220284304da96a190b5380db4d590dfdd (commit)
from 145156970740eaa40ec081ced9a5d047f6f0919d (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 +++--
debian/control | 5 ++++-
.../etc/x2gothinclient_settings | 18 ++++++++++++++----
.../sbin/x2gothinclient_create | 8 ++++++--
4 files changed, 27 insertions(+), 9 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 714fbc0..4119c32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-x2gothinclient (1.0.1.9-0~x2go1) UNRELEASED; urgency=low
+x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
- * New upstream version (1.0.1.9):
+ * New upstream version (1.0.99.1):
- When X2Go TCE has plymouth installed, make sure pressing the
halt button does not change to the wrong tty.
- Truncate echo output lines to less than 80 chars.
@@ -8,6 +8,7 @@ x2gothinclient (1.0.1.9-0~x2go1) UNRELEASED; urgency=low
that fails on wheezy). The change is needed for squeeze only.
- Fix x2go_tce_shell.sh script, escape braces.
- Change method of mounting /proc, /sys and /dev inside of chroots.
+ - Step towards wheezy, enable plymouth boot splash.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200
diff --git a/debian/control b/debian/control
index 21bf456..c87e6fc 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,8 @@ Depends:
x2goclient (>= 3.99.1.1-0~),
xauth,
xinit,
- locales
+ locales,
+ plymouth,
Recommends:
x2gocdmanager,
x2gousbmount,
@@ -62,6 +63,8 @@ Recommends:
mc,
acpid,
memtest86+
+Suggests:
+ plymouth-themes-all
Breaks:
x2gothinshutdown
Replaces:
diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings
index 283a62d..5140599 100644
--- a/x2gothinclientmanagement/etc/x2gothinclient_settings
+++ b/x2gothinclientmanagement/etc/x2gothinclient_settings
@@ -18,6 +18,9 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+# name of this instance of the X2Go TCE (appears during thinclient boot process)
+TC_PRETTY_NAME="X2Go TCE"
+
# base path for X2Go thin client files
TC_BASE="/opt/x2gothinclient"
@@ -33,13 +36,18 @@ TC_SHELL="bash"
# Debian package mirror to use...
TC_DEBMIRROR_URL="http://ftp.debian.org/debian"
+# Distro codename to use...
+#TC_DISTRO_CODENAME="wheezy"
+# or use older Debian squeeze...
+TC_DISTRO_CODENAME="squeeze"
+
# Retrieve X2Go packages from this URL
-TC_X2GO_DEBURL="deb http://packages.x2go.org/debian stable main"
+TC_X2GO_DEBURL="deb http://packages.x2go.org/debian $TC_DISTRO_CODENAME main"
# Use a http/ftp proxy during debootstrap (leave empty if direct connections to http/ftp are allowed)
-# TC_HTTP_PROXY="http://proxy.mydomain.com:8080"
-# TC_HTTPS_PROXY="http://proxy.mydomain.com:8080"
-# TC_FTP_PROXY="http://proxy.mydomain.com:8080"
+#TC_HTTP_PROXY="http://webcache.intern:3128"
+#TC_HTTPS_PROXY="http://webcache.intern:3128"
+#TC_FTP_PROXY="http://webcache.intern:3128"
TC_HTTP_PROXY=""
TC_HTTPS_PROXY=""
TC_FTP_PROXY=""
@@ -56,10 +64,12 @@ echo "============================="
echo "The X2Go Thin Client Environment is using the following"
echo "settings:"
echo
+echo "TC_PRETTY_NAME=$TC_PRETTY_NAME"
echo "TC_BASE=$TC_BASE"
echo "TC_CONFIG=$TC_CONFIG"
echo "TC_CHROOT=$TC_CHROOT"
echo "TC_SHELL=$TC_SHELL"
+ecjp "TC_DISTRO_CODENAME=$TC_DISTRO_CODENAME"
echo "TC_DEBMIRROR_URL=$TC_DEBMIRROR_URL"
echo "TC_X2GO_DEBURL=$TC_X2GO_DEBURL"
echo "TC_HTTP_PROXY=$TC_HTTP_PROXY"
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index 3d1de34..6da1543 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -38,8 +38,9 @@ source $ETCDIR/x2gothinclient_settings
TC_BASE="${TC_BASE:-/opt/x2gothinclient}"
TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}"
TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}"
+TC_DISTRO_CODENAME="${IK_DISTRO_CODENAME:-squeeze}"
TC_DEBMIRROR_URL="${TC_DEBMIRROR_URL:-'http://ftp.debian.org/debian'}"
-TC_X2GO_DEBURL="${TC_X2GO_DEBURL:-'deb http://packages.x2go.org stable main'}"
+TC_X2GO_DEBURL="${TC_X2GO_DEBURL:-'deb http://packages.x2go.org $TC_DISTRO_CODENAME main'}"
TC_MODULE_BLACKLIST="${TC_MODULE_BLACKLIST:-'pcspkr'}"
test -e "$TC_CHROOT" && {
@@ -75,7 +76,7 @@ export http_proxy="$TC_HTTP_PROXY"
export https_proxy="$TC_HTTPS_PROXY"
export ftp_proxy="$TC_FTP_PROXY"
-debootstrap --arch i386 stable $TC_CHROOT/ $TC_DEBMIRROR_URL
+debootstrap --arch i386 $TC_DISTRO_CODENAME $TC_CHROOT/ $TC_DEBMIRROR_URL
cp /etc/resolv.conf $TC_CHROOT/etc/resolv.conf
echo "auto lo" >> $TC_CHROOT/etc/network/interfaces
echo "iface lo inet loopback" >> $TC_CHROOT/etc/network/interfaces
@@ -161,6 +162,9 @@ chmod +x /sbin/start-stop-daemon
[ \$? -eq 0 ] && rm -f /etc/mtab
[ \$? -eq 0 ] && ln -sf /proc/mounts /etc/mtab
+# tweak plymouth
+[ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$IK_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$IK_PRETTY_NAME" >> /etc/os-release
+
# restore start-stop-daemon
[ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon
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).
More information about the x2go-commits
mailing list