[X2Go-Commits] [live-build-x2go] 150/166: switched to motd instead of issue.net, removed motd display from pam login so it doesn't appear twice on local login

[git-admin at x2go.org]

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

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

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

    switched to motd instead of issue.net, removed motd display from pam login so it doesn't appear twice on local login
---
 config/includes.chroot/lib/live/config/2100-show-sysconf | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2100-show-sysconf b/config/includes.chroot/lib/live/config/2100-show-sysconf
index 70dcae3..1725540 100755
--- a/config/includes.chroot/lib/live/config/2100-show-sysconf
+++ b/config/includes.chroot/lib/live/config/2100-show-sysconf
@@ -29,8 +29,9 @@ fi
 
 	# clear old entries
 	sed -i '/^- /d' /etc/issue
-	#sed -i '/^- /d' /etc/issue.net
-	#sed -i '/^- /d' /etc/motd
+	# delete motd call from pam login, so we don't get the same greeting twice when logging in locally
+	sed -i '/^session    optional   pam_motd.so/d' /etc/pam.d/login
+
 
 	## enable banner in sshd config if it was disabled
 	#sed -i 's/^#Banner/Banner/' /etc/ssh/sshd_config
@@ -54,10 +55,6 @@ fi
 	echo "\$IPMSG" >> /etc/issue
 	[ -n "\$BOOTEDENV" ] && echo "- Booted Environment: \$BOOTEDENV" >> /etc/issue
 	[ -n "\$TIMESTAMP" ] && echo "- Build Version: \$TIMESTAMP (\$HUMANTIMESTAMP)" >> /etc/issue
-	# we need to strip the ANSI as it doesn't work in issue.net via SSH
-	echo "\$IPMSG" | sed -r "s/\x1B\[(([0-9]+)(;[0-9]+)*)?[m,K,H,f,J]//g" >> /etc/issue.net
-	[ -n "\$BOOTEDENV" ] && echo "- Booted Environment: \$BOOTEDENV" >> /etc/issue.net
-	[ -n "\$TIMESTAMP" ] && echo "- Build Version: \$TIMESTAMP (\$HUMANTIMESTAMP)" >> /etc/issue.net
 	echo "\$IPMSG" >> /etc/motd
 	[ -n "\$BOOTEDENV" ] && echo "- Booted Environment: \$BOOTEDENV" >> /etc/motd
 	[ -n "\$TIMESTAMP" ] && echo "- Build Version: \$TIMESTAMP (\$HUMANTIMESTAMP)" >> /etc/motd

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