xinit + live-config now synchronous, we need a bg.png "configuring"

Webconverger · Mar 31, 2012 · 9601a65 · 9601a65
1 parent d34d230
commit 9601a65
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/etc/webc/live-config.sh b/etc/webc/live-config.sh
@@ -85,6 +85,7 @@ update_cmdline() {
 
 	# A configuration file always has a homepage
 	grep -qs homepage /etc/webc/cmdline.tmp && mv /etc/webc/cmdline.tmp /etc/webc/cmdline
+	touch /etc/webc/cmdline
 }
 
 test -e $live_config_pipe && rm -f $live_config_pipe

diff --git a/etc/webc/webc.conf b/etc/webc/webc.conf
@@ -32,6 +32,9 @@ live_config_update()
 {
 touch $live_config_flag 
 echo "run" > $live_config_pipe
+while ! test -e /etc/webc/cmdline; do
+	sleep 0.25
+done
 while test $live_config_flag -nt /etc/webc/cmdline; do
 	sleep 0.25
 done 

diff --git a/home/webc/.xinitrc b/home/webc/.xinitrc
@@ -11,17 +11,19 @@ cmdline_has debug || {
 	exec &> ~/.xerrors
 }
 
+homepage="$install_qa_url" # default homepage
+cp /home/webc/bg.orig /home/webc/bg.png # default Webconverger branding
+
+xloadimage -quiet -onroot -center /home/webc/bg.png
 if ! has_network
 then
 	xloadimage -quiet -onroot -center /etc/webc/no-net.png
 	while ! has_network && ! cmdline_has debug; do
 		sleep 1
 	done
-	live_config_update
 fi
+live_config_update
 
-homepage="$install_qa_url" # default homepage
-cp /home/webc/bg.orig /home/webc/bg.png # default Webconverger branding
 
 wm="/usr/bin/dwm.web" # defaults
 xset s on
@@ -118,4 +120,5 @@ do
 	rm -rf /home/webc/.macromedia
 	rm -rf /home/webc/Downloads
 
+	live_config_update
 done