[X2Go-Commits] [live-build-x2go] 43/167: fixed HEREDOCs

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 00:32:39 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 cdac40c6b4f3cfb367f6d43576c609b26ac839a6
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Jul 23 16:34:18 2017 +0200

    fixed HEREDOCs
---
 config/includes.chroot/lib/live/config/2000-waitforvts | 3 ++-
 config/includes.chroot/lib/live/config/2050-settime    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2000-waitforvts b/config/includes.chroot/lib/live/config/2000-waitforvts
index 43fca6d..3d62af7 100755
--- a/config/includes.chroot/lib/live/config/2000-waitforvts
+++ b/config/includes.chroot/lib/live/config/2000-waitforvts
@@ -7,7 +7,7 @@ WaitForVTs ()
 #
 echo -n " waitforvts"
 
-cat >/etc/network/if-up.d/0000-waitforvts <<SHOWIPS
+cat >/etc/network/if-up.d/0000-waitforvts <<WAITFORVTS
 #!/bin/bash
 export TERM=linux;
 
@@ -16,6 +16,7 @@ while ! [ -c /dev/tty$(fgconsole -n) ] ; do
 	echo -en "\n'\$0' is waiting for an unused VT to become available."
 	sleep 2
 done
+WAITFORVTS
 
 chmod 755 /etc/network/if-up.d/0000-waitforvts
 
diff --git a/config/includes.chroot/lib/live/config/2050-settime b/config/includes.chroot/lib/live/config/2050-settime
index dddfb1d..549e48b 100755
--- a/config/includes.chroot/lib/live/config/2050-settime
+++ b/config/includes.chroot/lib/live/config/2050-settime
@@ -7,7 +7,7 @@ SetTime ()
 #
 echo -n " settime"
 
-cat >/etc/network/if-up.d/0050-settime <<SHOWIPS
+cat >/etc/network/if-up.d/0050-settime <<SETTIME
 #!/bin/bash
 export TERM=linux;
 
@@ -20,6 +20,7 @@ if ntpdate-debian -s && hwclock --systohc ; then
 else
 	echo -en "\n\$(date +'%F | %T | ')'\$0' - error setting time. Timestamps will be based on CMOS Clock." | tee -a /dev/tty\$(fgconsole -n)
 fi
+SETTIME
 
 chmod 755 /etc/network/if-up.d/0050-settime
 

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