[X2Go-Commits] [live-build-x2go] 22/160: improved log output

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 01:55:35 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 cdc01cd4d39493cbb34731feda4412851e23a6e9
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Jul 22 11:53:55 2017 +0200

    improved log output
---
 config/includes.chroot/lib/live/config/2000-showifconfig          | 2 +-
 .../includes.chroot/lib/live/config/2150-getsshpubkeysfromserver  | 2 +-
 .../includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf | 2 +-
 config/includes.chroot/lib/live/config/2500-tcpprint              | 8 ++++----
 config/includes.chroot/lib/live/config/2600-x2go-getsessions      | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2000-showifconfig b/config/includes.chroot/lib/live/config/2000-showifconfig
index e42ccf4..faa5918 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 "\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty9
+	echo -n "\\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty9
 	sleep 2
 done
 
diff --git a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
index 382a797..3070fa2 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 "\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty9
+	echo -n "\\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty9
 	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 0bb16a7..4955f7b 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 "\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty9
+	echo -n "\\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty9
 	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 a7cb327..c22e235 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 -e "\n\$(date +'%F | %T | ')Setting up local printers ..." | tee -a /dev/tty9
+	echo -en "\\n\$(date +'%F | %T | ')Setting up local printers ..." | tee -a /dev/tty9
 
 	# Create a listening port for a TCP/9100-RAW-printer
 	#
@@ -52,21 +52,21 @@ service jetdirect${PRINTERCOUNT}
 	$TCPPRINTONLYFROM
 }
 JETDIRCONF
-		echo "\$(date +'%F | %T | ')Mapping $PRINTERDEV => $PORTNUMBER" | tee -a /dev/tty9
+		echo -en "\\n\$(date +'%F | %T | ')Mapping $PRINTERDEV => $PORTNUMBER" | tee -a /dev/tty9
 		PRINTERCOUNT=$((PRINTERCOUNT+1))
 	done
 
 	echo "#Local printer config: Done." >/etc/xinetd.d/jetdirect
 
 	if ps -C xinetd --no-header >/dev/null ; then
-		echo -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/tty9
 		if /etc/init.d/xinetd restart; then
 			echo -n " success. All done." | tee -a /dev/tty9
 		else
 			echo -n " error." | tee -a /dev/tty9
 		fi
 	else
-		echo -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/tty9
 	fi
 
 	) &
diff --git a/config/includes.chroot/lib/live/config/2600-x2go-getsessions b/config/includes.chroot/lib/live/config/2600-x2go-getsessions
index f0a7848..da0135b 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 "\$(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/tty9
 	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 "Waiting for session config data ..."
+			echo -en "\\n\$(date +'%F | %T | ')Waiting for session config data ..." | tee -a /dev/tty9
 			sleep 5
 		done
 	fi
 else
 	while ! wget -q -O $SESSIONSDESTINATION $SESSIONSURL ; do
-		echo "Waiting for session config data ..."
+		echo -en "\\n\$(date +'%F | %T | ')Waiting for session config data ..." | tee -a /dev/tty9
 		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