[X2Go-Commits] [live-build-x2go] 98/167: further speed improvements, also, enable banner in sshd config if it was disabled

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 00:32:49 CET 2017


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

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

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

    further speed improvements, also, enable banner in sshd config if it was disabled
---
 config/includes.chroot/lib/live/config/2100-show-sysconf | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2100-show-sysconf b/config/includes.chroot/lib/live/config/2100-show-sysconf
index d88a791..4a2c5c5 100755
--- a/config/includes.chroot/lib/live/config/2100-show-sysconf
+++ b/config/includes.chroot/lib/live/config/2100-show-sysconf
@@ -26,6 +26,15 @@ fi
 		TIMESTAMP=\$(stat -c %Y /lib/live/mount/rootfs/filesystem.squashfs/lib)
 		HUMANTIMESTAMP=\$(date --date="@\$TIMESTAMP")
 	fi
+
+	# clear old entries
+	sed -i '/^- /d' /etc/issue
+	sed -i '/^- /d' /etc/issue.net
+	sed -i '/^- /d' /var/run/banner
+
+	# enable banner in sshd config if it was disabled
+	sed -i 's/^#Banner/Banner/' /etc/ssh/sshd_config
+
 	while ! [ -c /dev/tty8 ] ; do
 		echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for tty8 to become available."
 		sleep 2
@@ -42,15 +51,12 @@ fi
 		/bin/grep -P --color=always "link/ether .*? |$" )
 
 	IPMSG=\$( sed 's/^/- /' <<< "\$IPMSG" )
-	sed -i '/^- /d' /etc/issue
 	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
 	[ -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

--
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