[X2Go-Commits] [live-build-x2go] 05/11: Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround-stretch-bpokrnl

[git-admin at x2go.org]

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

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

commit 451322d66f0262718d5789467601f77f832b6c12
Merge: bf2f237 32c61bf
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Thu Feb 8 00:38:10 2018 +0100

    Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround-stretch-bpokrnl
    
    Conflicts:
    	config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig

 .../lib/live/config/2260-getsshhostkeysfrommedia   | 167 ++++++++++++---------
 .../lib/live/config/2270-getsshclientkeysfrommedia | 117 +++++++++------
 ...ppsessions => 2280-x2go-getportableappsessions} |   0
 .../lib/live/config/2900-x2go-thinclientconfig     |  35 +++++
 4 files changed, 197 insertions(+), 122 deletions(-)

diff --cc config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index 9711f09,6939b68..f099c4a
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@@ -269,7 -236,39 +273,38 @@@ if [ -n "\$BLANKINGTIME" ]; the
  	fi
  fi
  
+ if [ -n "\$AUDIOOUT" ] ; then
+ 	(
+ 		while ! pacmd dump 2>&1| grep -q set-card-profile ; do
+ 			echo -en "\n\$(date +'%F | %T | ')'\$0': Waiting for pulseaudio to start ..." | tee -a /dev/tty8
+ 			sleep 1
+ 		done
+ 		if [ "\$AUDIOOUT" = "list" ] ; then
+ 			echo -en "\n\$(date +'%F | %T | ')'\$0': Available audio outputs:" | tee -a /dev/tty8
+ 			AUDIOOUTPUTS=\$(	for CARD in \$(pacmd list-cards | grep -A1 index | awk -F '[<> \t]' ' \$2 == "name:" { print \$4 }'); do 
+ 						pacmd list-cards | \
+ 						more +/"\$CARD" | \
+ 						grep -m 1 "\$CARD" -A100000 | \
+ 						more +/"profiles:" | \
+ 						grep -m 1 -B10000 "active profile:" | \
+ 						grep -A10000 "profiles" | \
+ 						grep "\W\Woutput:" | \
+ 						grep -v "active profile:" | \
+ 						awk -F'[+:]' '{gsub("\t","",\$1) ; print "\"'\$CARD'|" \$1 ":" \$2 "\""} ';
+ 					done | \
+ 					sort -u )
+ 			for AUDIOOUTPUT in \$AUDIOOUTPUTS; do
+ 				echo -en "\n\$(date +'%F | %T | ')'\$0': \$AUDIOOUTPUT" | tee -a /dev/tty8
+ 			done
+ 			echo -en "\n\$(date +'%F | %T | ')'\$0': \$(pacmd list | 'grep active profile')" | tee -a /dev/tty8
+ 		elif (echo "\$AUDIOOUT" | grep -q '^[^|]*|[^|]*\$') ; then
+ 			\$(echo "\$AUDIOOUT" | sed -e 's/^/pacmd set-card-profile /' -e 's/|/ /')
+ 		else
+ 			: # NOP
+ 		fi
+ 	) &
+ fi
 -
 -eval \$THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$BACKGROUND \$BRANDING \$STARTSESSION
 +eval \$THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$BACKGROUND \$BRANDING \$STARTSESSION $DEBUGPARAMS # yes, no escape sign in front of DEBUGPARAMS, that is intentional
  XSESSION
  
  chown user:user /home/user/.xsession

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git