Modification : polissage et log

[lhc/ateliers.git] / vm_remote

diff --git a/vm_remote b/vm_remote
index 946706a..1a599dc 100755 (executable)
--- a/vm_remote
+++ b/vm_remote
@@ -13,10 +13,10 @@ rule_help () {
                             Voir \`$tool/vm_hosted' pour les utilitaires côté VM hébergée.
                SYNTAX: $0 \$RULE \${RULE}_SYNTAX
                RULES:
-               $(sed -ne 's/^rule_\([^_][^ ]*\) () {\( *#.*\|\)/\t\1\2/p' "$tool"/vm.sh "$0")
+               $(sed -ne 's/^rule_\([^_][^ ]*\) () {\( *#.*\|\)/\t\1\2/p' "$tool"/etc/vm.sh "$0")
                ENVIRONMENT:
                  TRACE # affiche les commandes avant leur exécution
-               $(sed -ne 's/^readonly \([^ ][^ =]*\).*}\( *#.*\|\)$/\t$\1\2/p' "$tool"/vm.sh "$0")
+               $(sed -ne 's/^readonly \([^ ][^ =]*\).*}\( *#.*\|\)$/\t$\1\2/p' "$tool"/etc/vm.sh "$0")
                EOF
  }
 
@@ -26,7 +26,7 @@ rule_git_config () {
        git config remote.host.url >/dev/null ||
        git remote add host $vm_host:tool/vm
        git config --replace remote.host HEAD:refs/heads/origin
-       git config remote.$vm.url >/dev/null ||
+       git config remote.vm.url >/dev/null ||
        git remote add vm root@$vm_fqdn:tool/vm
        git config --replace remote.$vm HEAD:refs/heads/origin
        )
@@ -57,7 +57,7 @@ rule_disk_key_backup () {
        for part in root var home
         do
                mkdir -p var/lib/luks
-               rule_ssh -l root ' \
+               rule ssh -l root ' \
                        tmp=$(mktemp)
                        cryptsetup luksHeaderBackup \
                         /dev/$vm_lvm_vg/${vm_lvm_lv}_${part} \
@@ -75,10 +75,8 @@ ${1+shift}
 case $rule in
  (help);;
  (*)
-       test ! "$(hostname --fqdn)" = "$vm_fqdn" &&
-       test ! "$(hostname --fqdn)" = "$vm_host" ||
-       error 1 "mauvaise machine"
-       ${TRACE:+set -x}
+       assert 'test ! "$(hostname --fqdn)" = "$vm_fqdn"' vm_fqdn
+       assert 'test ! "$(hostname --fqdn)" = "$vm_host"' vm_host
        ;;
  esac
-rule_$rule "$@"
+rule $rule "$@"