[X2Go-Commits] [live-build-x2go] 78/166: tty9 -> tty(first unused VT)

git-admin at x2go.org git-admin at x2go.org
Mon Nov 20 02:16:51 CET 2017


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 7cc852af668b2120623b036461bd5bbd620184d8
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Jul 23 01:19:47 2017 +0200

    tty9 -> tty(first unused VT)
---
 config/includes.chroot/lib/live/config/2000-showifconfig     |  2 +-
 .../lib/live/config/2150-getsshpubkeysfromserver             |  2 +-
 .../lib/live/config/2200-xserver-xorg-getxorgconf            |  2 +-
 config/includes.chroot/lib/live/config/2500-tcpprint         | 12 ++++++------
 config/includes.chroot/lib/live/config/2600-x2go-getsessions |  6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2000-showifconfig b/config/includes.chroot/lib/live/config/2000-showifconfig
index 0f96fdf..6ebb066 100755
--- a/config/includes.chroot/lib/live/config/2000-showifconfig
+++ b/config/includes.chroot/lib/live/config/2000-showifconfig
@@ -17,7 +17,7 @@ cat >/etc/network/if-up.d/0100-showips <<SHOWIPS
 export TERM=linux;
 
 while [ -z "\$(hostname -I)" ] ; do
-	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty9
+	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty\$(fgconsole -n)
 	sleep 2
 done
 
diff --git a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
index 22dc9fd..21f0c31 100755
--- a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
+++ b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
@@ -18,7 +18,7 @@ GetSSHPubKeysFromServer ()
 export TERM=linux;
 
 while [ -z "\$(hostname -I)" ] ; do
-	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty9
+	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty\$(fgconsole -n)
 	sleep 2
 done
 
diff --git a/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf
index e89a565..06794b1 100755
--- a/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf
+++ b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf
@@ -16,7 +16,7 @@ echo -n " xserver-xorg-getxorgconf"
 export TERM=linux;
 
 while [ -z "\$(hostname -I)" ] ; do
-	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty9
+	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty\$(fgconsole -n)
 	sleep 2
 done
 if echo "$XORGCONFURL" | grep -q "^tftp://" ; then
diff --git a/config/includes.chroot/lib/live/config/2500-tcpprint b/config/includes.chroot/lib/live/config/2500-tcpprint
index 477a53d..2bb453b 100755
--- a/config/includes.chroot/lib/live/config/2500-tcpprint
+++ b/config/includes.chroot/lib/live/config/2500-tcpprint
@@ -28,7 +28,7 @@ if grep -q "\W*tcpprint\W*" /proc/cmdline ; then
 	[ -d /dev/usb ] && PRINTERDEVICES=$(find /dev/usb -type c -name "lp*" | sort)
 	PRINTERDEVICES="$PRINTERDEVICES $(find /dev/ -maxdepth 1 -type c -name "lp*" | sort)"
 
-	echo -en "\n\$(date +'%F | %T | ')Setting up local printers ..." | tee -a /dev/tty9
+	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty\$(fgconsole -n)
 
 	# Create a listening port for a TCP/9100-RAW-printer
 	#
@@ -52,21 +52,21 @@ service jetdirect${PRINTERCOUNT}
 	$TCPPRINTONLYFROM
 }
 JETDIRCONF
-		echo -en "\n\$(date +'%F | %T | ')Mapping $PRINTERDEV => $PORTNUMBER" | tee -a /dev/tty9
+		echo -en "\n\$(date +'%F | %T | ')Mapping $PRINTERDEV => $PORTNUMBER" | tee -a /dev/tty\$(fgconsole -n)
 		PRINTERCOUNT=$((PRINTERCOUNT+1))
 	done
 
 	echo "#Local printer config: Done." >/etc/xinetd.d/jetdirect
 
 	if ps -C xinetd --no-header >/dev/null ; then
-		echo -en "\n\$(date +'%F | %T | ')xinetd needs to be restarted, trying to do that ..." | tee -a /dev/tty9
+		echo -en "\n\$(date +'%F | %T | ')xinetd needs to be restarted, trying to do that ..." | tee -a /dev/tty\$(fgconsole -n)
 		if /etc/init.d/xinetd restart; then
-			echo -n " success. All done." | tee -a /dev/tty9
+			echo -n " success. All done." | tee -a /dev/tty\$(fgconsole -n)
 		else
-			echo -n " error." | tee -a /dev/tty9
+			echo -n " error." | tee -a /dev/tty\$(fgconsole -n)
 		fi
 	else
-		echo -en "\n\$(date +'%F | %T | ')No xinetd restart necessary. All done." | tee -a /dev/tty9
+		echo -en "\n\$(date +'%F | %T | ')No xinetd restart necessary. All done." | tee -a /dev/tty\$(fgconsole -n)
 	fi
 
 	) &
diff --git a/config/includes.chroot/lib/live/config/2600-x2go-getsessions b/config/includes.chroot/lib/live/config/2600-x2go-getsessions
index 7e633ac..eff3073 100755
--- a/config/includes.chroot/lib/live/config/2600-x2go-getsessions
+++ b/config/includes.chroot/lib/live/config/2600-x2go-getsessions
@@ -19,7 +19,7 @@ X2GoGetSessions ()
 export TERM=linux;
 
 while [ -z "\$(hostname -I)" ] ; do
-	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty9
+	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty\$(fgconsole -n)
 	sleep 2
 done
 if echo "$SESSIONSURL" | grep -q "^tftp://" ; then
@@ -27,13 +27,13 @@ if echo "$SESSIONSURL" | grep -q "^tftp://" ; then
 	SESSIONSPATH=$(echo "$SESSIONSURL" | sed 's#^tftp://[^/]*/\(.*\)$#\1#' )
 	if [ -n "\$SESSIONSSERVER" ] && [ -n "\$SESSIONSPATH" ] ; then
 		while ! atftp \$SESSIONSSERVER -g -r \$SESSIONSPATH -l $SESSIONSDESTINATION ; do
-			echo -en "\n\$(date +'%F | %T | ')Waiting for session config data ..." | tee -a /dev/tty9
+			echo -en "\n\$(date +'%F | %T | ')Waiting for session config data ..." | tee -a /dev/tty\$(fgconsole -n)
 			sleep 5
 		done
 	fi
 else
 	while ! wget -q -O $SESSIONSDESTINATION $SESSIONSURL ; do
-		echo -en "\n\$(date +'%F | %T | ')Waiting for session config data ..." | tee -a /dev/tty9
+		echo -en "\n\$(date +'%F | %T | ')Waiting for session config data ..." | tee -a /dev/tty\$(fgconsole -n)
 		sleep 5 
 	done
 fi

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