live_config_update now blocks

Webconverger · Mar 31, 2012 · 54879d4 · 54879d4
1 parent cf54c86
commit 54879d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/etc/webc/live-config.sh b/etc/webc/live-config.sh
@@ -84,7 +84,7 @@ update_cmdline() {
 	done
 
 	# A configuration file always has a homepage
-	test -s /etc/webc/cmdline.tmp && grep -qs homepage /etc/webc/cmdline.tmp && mv /etc/webc/cmdline.tmp /etc/webc/cmdline
+	grep -qs homepage /etc/webc/cmdline.tmp && mv /etc/webc/cmdline.tmp /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
@@ -26,10 +26,15 @@ config_url="${install_base_url}/install-config/${webc_id}"
 
 # live config
 live_config_pipe="/var/run/live-config.pipe"
+live_config_flag="/tmp/live-config-flag"
 
 live_config_update()
 {
+touch $live_config_flag 
 echo "run" > $live_config_pipe
+while test $live_config_flag -nt /etc/webc/cmdline; do
+	sleep 0.25
+done 
 }
 
 logs ()

diff --git a/home/webc/.xinitrc b/home/webc/.xinitrc
@@ -18,7 +18,6 @@ then
 		sleep 1
 	done
 	live_config_update
-	sleep 5
 fi
 
 homepage="$install_qa_url" # default homepage