[X2go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-8-gc325184
X2Go dev team
git-admin at x2go.org
Thu Aug 23 14:20:52 CEST 2012
The branch, master has been updated
via c325184220284304da96a190b5380db4d590dfdd (commit)
via 145156970740eaa40ec081ced9a5d047f6f0919d (commit)
via 12d42ec1454f055391d4039371873a9503705396 (commit)
via 30e3aac705162504e222e5dc5d0ec0e05270394c (commit)
via d7ce549428428b76c605a24c6d117fac2072358c (commit)
from a449f64ce0b6054485d90da45092d7b306405cd3 (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 c325184220284304da96a190b5380db4d590dfdd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Aug 23 14:20:13 2012 +0200
Next upstream version will be 1.0.99.1: Step towards wheezy. Also: enable plymouth boot splash.
commit 145156970740eaa40ec081ced9a5d047f6f0919d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Aug 23 14:07:17 2012 +0200
Change method of mounting /proc, /sys and /dev inside of chroots.
commit 12d42ec1454f055391d4039371873a9503705396
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Aug 23 14:01:23 2012 +0200
Fix x2go_tce_shell.sh script, escape braces.
commit 30e3aac705162504e222e5dc5d0ec0e05270394c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Aug 23 14:00:18 2012 +0200
Use sed to patch initramfs configuration (rather than a patch that fails on wheezy). The change is needed for squeeze only.
commit d7ce549428428b76c605a24c6d117fac2072358c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Aug 23 13:58:12 2012 +0200
Truncate echo output lines to less than 80 chars.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 10 +++++-
debian/control | 5 ++-
.../etc/x2gothinclient_settings | 18 ++++++++--
.../sbin/x2gothinclient_cleanup | 16 ++++++---
.../sbin/x2gothinclient_create | 34 ++++++++++++-------
.../sbin/x2gothinclient_preptftpboot | 3 +-
x2gothinclientmanagement/sbin/x2gothinclient_shell | 21 ++++++++----
.../sbin/x2gothinclient_update | 6 ++-
.../sbin/x2gothinclient_upgrade | 19 +++++++---
9 files changed, 91 insertions(+), 41 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2f360a0..4119c32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-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.
+ - Use sed to patch initramfs configuration (rather than a patch
+ 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_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup
index 98855fd..c17ab19 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup
@@ -38,14 +38,17 @@ TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}"
TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}"
[ "x$USER" == "xroot" ] || {
- echo "ERROR: X2Go Thin Client management scripts have to run as super-user root."
+ echo "ERROR: X2Go Thin Client management scripts have to run"
+ echo "as super-user root."
exit -2
}
echo "X2go TCE cleanup..."
echo "-------------------"
-echo "Hit <RETURN> to purge all X2Go TCE related files (chroot, TCE config, PXE boot env)..."
+echo "Hit <RETURN> to purge all X2Go TCE related files (chroot,"
+echo "TCE config, PXE boot env)..."
+echo
echo "Alternatively, hit STRG-C to cancel the operation now!!!"
read
@@ -54,13 +57,15 @@ test -e "$TC_CHROOT" && {
echo "Removing $TC_CHROOT..."
rm -Rf "${TC_CHROOT}"
} || {
- echo "WARNING: X2Go Thin Client chroot does not exist at $TC_CHROOT. No cleanup necessary..."
+ echo "WARNING: X2Go Thin Client chroot does not exist"
+ echo "at $TC_CHROOT. No cleanup necessary..."
}
test -e "$TC_CONFIG" && {
echo "Removing $TC_CONFIG..."
rm -Rf "${TC_CONFIG}"
} || {
- echo "WARNING: X2Go Thin Client config does not exist at $TC_CONFIG. No cleanup necessary..."
+ echo "WARNING: X2Go Thin Client config does not exist"
+ echo "at $TC_CONFIG. No cleanup necessary..."
}
### PXE/Syslinux
@@ -68,7 +73,8 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && {
echo "Emptying $TC_TFTP_BOOT..."
rm -Rf "${TC_TFTP_BOOT}"/*
} || {
- echo "WARNING: X2Go PXE/Syslinux boot environment does not exist at $TC_TFTP_BOOT. No cleanup necessary..."
+ echo "WARNING: X2Go PXE/Syslinux boot environment does not exist"
+ echo "at $TC_TFTP_BOOT. No cleanup necessary..."
}
echo
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index a14ae17..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" && {
@@ -53,7 +54,9 @@ test -e "$TC_CHROOT" && {
exit -2
}
-echo "Hit <RETURN> to continue with X2Go TCE chroot creation using the above TCE parameters..."
+echo "Hit <RETURN> to continue with X2Go TCE chroot creation using"
+echo "the above TCE parameters..."
+echo
echo "Alternatively, hit STRG-C to cancel the operation now!!!"
read
@@ -73,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
@@ -101,8 +104,6 @@ cat > $TC_CHROOT/x2go_tce_install.sh <<EOF
#!/bin/bash
export LANG=C
-mount /proc
-mount /dev/pts
export HOME=/root
export http_proxy=$TC_HTTP_PROXY
export https_proxy=$TC_HTTPS_PROXY
@@ -143,12 +144,8 @@ chmod +x /sbin/start-stop-daemon
# Pulsaudio must come afterwards until the thinclient-package is fixed
[ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y
[ \$? -eq 0 ] && apt-get install patch -y
-[ \$? -eq 0 ] && patch /etc/initramfs-tools/initramfs.conf <<PATCH
-39c39
-< BOOT=local
----
-> BOOT=nfs
-PATCH
+[ \$? -eq 0 ] && sed -e 's/BOOT=local/BOOT=nfs/' -i /etc/initramfs-tools/initramfs.conf
+
[ \$? -eq 0 ] && rm -f /etc/udev/rules.d/*-persistent-*.rules
[ \$? -eq 0 ] && useradd x2goclient
[ \$? -eq 0 ] && adduser x2goclient audio
@@ -165,15 +162,26 @@ PATCH
[ \$? -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
-umount -l /proc &>/dev/null
-umount -l /dev/pts &>/dev/null
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
+
chroot $TC_CHROOT /x2go_tce_install.sh
+umount $TC_CHROOT/proc
+umount $TC_CHROOT/dev
+umount $TC_CHROOT/sys
+
rm -f $TC_CHROOT/etc/udev/rules.d/*-persistent-*.rules
x2gothinclient_update
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot
index a011f8b..1dd9101 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot
@@ -49,7 +49,8 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && {
}
[ "x$USER" == "xroot" ] || {
- echo "ERROR: X2Go Thin Client management scripts have to run as super-user root."
+ echo "ERROR: X2Go Thin Client management scripts have to run"
+ echo "as super-user root."
exit -2
}
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell
index 625bb16..67a8203 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -42,14 +42,13 @@ test -e "$TC_CHROOT" || {
}
[ "x$USER" == "xroot" ] || {
- echo "ERROR: X2Go Thin Client management scripts have to run as super-user root."
+ echo "ERROR: X2Go Thin Client management scripts have to run"
+ echo "as super-user root."
exit -2
}
cat > "$TC_CHROOT/x2go_tce_shell.sh" <<EOF
#!/bin/bash
-mount /proc &> /dev/null
-mount /dev/pts &> /dev/null
export HOME=/root
# export the proxy server (if any) to the shell.
@@ -59,7 +58,7 @@ export ftp_proxy=$TC_FTP_PROXY
echo 'This shell has been started in your X2Go Thin Clients chroot environment.'
echo 'All changes performed here will take effect on your X2Go Thin Clients'
-echo 'after their next (re)boot. So be careful!!!'
+echo 'after their next \(re\)boot. So be careful!!!'
echo
echo "To return from this chroot shell hit STRG+D or type ,,exit'' on the"
echo 'command line...'
@@ -78,12 +77,20 @@ chmod +x /sbin/start-stop-daemon
# restore start-stop-daemon
[ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon
-umount -l /proc &> /dev/null
-umount -l /dev/pts &> /dev/null
-
echo
echo "X2go Thin Client Shell has exited."
echo
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
+
chroot "$TC_CHROOT" /x2go_tce_shell.sh
+
+umount $TC_CHROOT/proc
+umount $TC_CHROOT/dev
+umount $TC_CHROOT/sys
+
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update
index 4df9ff3..24f2d8b 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_update
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_update
@@ -43,12 +43,14 @@ test -e "$TC_CHROOT" || {
}
test -e "$TC_CONFIG" || {
- echo "ERROR: No X2Go Thin Client configuration found at $TC_CONFIG. Please check..."
+ echo "ERROR: No X2Go Thin Client configuration found"
+ echo "at $TC_CONFIG. Please check..."
exit -1
}
[ "x$USER" == "xroot" ] || {
- echo "ERROR: X2Go Thin Client management scripts have to run as super-user root."
+ echo "ERROR: X2Go Thin Client management scripts have to run"
+ echo "as super-user root."
exit -2
}
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
index a206837..8f8c61e 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
@@ -41,14 +41,13 @@ test -e "$TC_CHROOT" || {
}
[ "x$USER" == "xroot" ] || {
- echo "ERROR: X2Go Thin Client management scripts have to run as super-user root."
+ echo "ERROR: X2Go Thin Client management scripts have to run"
+ echo "as super-user root."
exit -2
}
cat > "$TC_CHROOT/x2go_tce_upgrade.sh" <<EOF
#!/bin/bash
-mount /proc &> /dev/null
-mount /dev/pts &> /dev/null
export HOME=/root
export http_proxy=$TC_HTTP_PROXY
@@ -76,12 +75,20 @@ done
# restore start-stop-daemon
[ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon
-umount -l /proc &> /dev/null
-umount -l /dev/pts &> /dev/null
-
echo
echo "X2go Thin Client Shell upgrade has finished."
echo
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
+
chroot "$TC_CHROOT" /x2go_tce_upgrade.sh
+
+umount $TC_CHROOT/proc
+umount $TC_CHROOT/dev
+umount $TC_CHROOT/sys
+
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