Permalink
Browse files

live_config_update now blocks

  • Loading branch information...
1 parent cf54c86 commit 54879d41be727176544d7dbc8c57f0a0e1a72be6 root committed Mar 31, 2012
Showing with 6 additions and 2 deletions.
  1. +1 −1 etc/webc/live-config.sh
  2. +5 −0 etc/webc/webc.conf
  3. +0 −1 home/webc/.xinitrc
View
@@ -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
View
@@ -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 ()
View
@@ -18,7 +18,6 @@ then
sleep 1
done
live_config_update
- sleep 5
fi
homepage="$install_qa_url" # default homepage

0 comments on commit 54879d4

Please sign in to comment.