[X2Go-Commits] [live-build-x2go] 97/160: speed optimization, also addedoutputto /var/run/banner where ssh should pick it up

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 01:55:47 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox
in repository live-build-x2go.

commit b3a361843836aac6c67014fe267a1c860cef87e9
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed Jul 26 03:52:36 2017 +0200

    speed optimization, also addedoutputto /var/run/banner where ssh should pick it up
---
 .../lib/live/config/2100-show-sysconf              | 30 ++++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2100-show-sysconf b/config/includes.chroot/lib/live/config/2100-show-sysconf
index 0839c77..d88a791 100755
--- a/config/includes.chroot/lib/live/config/2100-show-sysconf
+++ b/config/includes.chroot/lib/live/config/2100-show-sysconf
@@ -19,6 +19,13 @@ if [ "\$METHOD" = "loopback" ] || [ "\$METHOD" = "none" ]; then
 fi
 
 (
+	if grep -q findiso /proc/cmdline ; then
+		BOOTEDENV=\$(basename \$(dirname \$(cat /proc/cmdline | tr " " "\n" | awk -F'=' ' \$1 == "findiso" { print \$2 }')))
+	fi
+	if [ -d /lib/live/mount/rootfs/filesystem.squashfs/lib ] ; then
+		TIMESTAMP=\$(stat -c %Y /lib/live/mount/rootfs/filesystem.squashfs/lib)
+		HUMANTIMESTAMP=\$(date --date="@\$TIMESTAMP")
+	fi
 	while ! [ -c /dev/tty8 ] ; do
 		echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for tty8 to become available."
 		sleep 2
@@ -36,22 +43,17 @@ fi
 
 	IPMSG=\$( sed 's/^/- /' <<< "\$IPMSG" )
 	sed -i '/^- /d' /etc/issue
-	sed -i '/^- /d' /etc/issue.net
 	echo "\$IPMSG" >> /etc/issue
+	[ -n "\$BOOTEDENV" ] && echo "- Booted Environment: \$BOOTEDENV" >> /etc/issue
+	[ -n "\$TIMESTAMP" ] && echo "- Build Version: \$TIMESTAMP (\$HUMANTIMESTAMP)" >> /etc/issue
+	sed -i '/^- /d' /etc/issue.net
 	echo "\$IPMSG" >> /etc/issue.net
-
-	if grep -q findiso /proc/cmdline ; then
-		BOOTEDENV=\$(basename \$(dirname \$(cat /proc/cmdline | tr " " "\n" | awk -F'=' ' \$1 == "findiso" { print \$2 }')))
-		echo "- Booted Environment: \$BOOTEDENV" >> /etc/issue
-		echo "- Booted Environment: \$BOOTEDENV" >> /etc/issue.net
-	fi
-
-	if [ -d /lib/live/mount/rootfs/filesystem.squashfs/lib ] ; then
-		TIMESTAMP=\$(stat -c %Y /lib/live/mount/rootfs/filesystem.squashfs/lib)
-		HUMANTIMESTAMP=\$(date --date="@\$TIMESTAMP")
-		echo "- Build Version: \$TIMESTAMP (\$HUMANTIMESTAMP)" >> /etc/issue
-		echo "- Build Version: \$TIMESTAMP (\$HUMANTIMESTAMP)" >> /etc/issue.net
-	fi
+	[ -n "\$BOOTEDENV" ] && echo "- Booted Environment: \$BOOTEDENV" >> /etc/issue.net
+	[ -n "\$TIMESTAMP" ] && echo "- Build Version: \$TIMESTAMP (\$HUMANTIMESTAMP)" >> /etc/issue.net
+	sed -i '/^- /d' /var/run/banner
+	echo "\$IPMSG" >> /var/run/banner
+	[ -n "\$BOOTEDENV" ] && echo "- Booted Environment: \$BOOTEDENV" >> /var/run/banner
+	[ -n "\$TIMESTAMP" ] && echo "- Build Version: \$TIMESTAMP (\$HUMANTIMESTAMP)" >> /var/run/banner
 ) &
 SHOWSYSCONF
 

--
Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git


More information about the x2go-commits mailing list