Correction : vm_hosted : rule_runit_configure : teste supervise/ok .

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index 3247eb5..94916c6 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -35,6 +35,16 @@ rule_git_configure () {
        tool=$(cd "$tool"; cd -)
        sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/
        sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/vm
+       sudo install -m 770 /dev/stdin .git/hooks/post-update <<-EOF
+               #!/bin/sh -efux
+               case \$1 in
+                (refs/remotes/master)
+                       cd ..
+                       git --git-dir=\$PWD/.git checkout -f -B master remotes/master
+                       git --git-dir=\$PWD/.git clean -f -d -
+                       ;;
+                esac
+               EOF
        )
  }
 rule_git_reset () {
@@ -716,7 +726,6 @@ rule_mysql_configure () {
                /home/mysql
            sudo -u mysql mysql_install_db --no-defaults --datadir=/home/mysql/
        fi
-       sudo service mysql restart
  }
 rule_network_configure () {
        sudo install -m 644 -o root -g root /dev/stdin /etc/hostname <<-EOF
@@ -1129,6 +1138,7 @@ rule_runit_configure () {
                        "$tool"/etc/sv/"$sv"/configure
                 then
                        ln -fns ../sv/"$sv" /etc/service/"$sv"
+                       test ! -e /etc/sv/"$sv"/supervise/ok ||
                        sv restart "$sv"
                 fi
         done