Correction : vm_hosted : user_admin_add.

[lhc/ateliers.git] / vm_remote

diff --git a/vm_remote b/vm_remote
index 64f2ca1..987be13 100755 (executable)
--- a/vm_remote
+++ b/vm_remote
@@ -3,8 +3,6 @@ set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
 . "$tool"/lib/functions.sh
 . "$tool"/etc/vm.sh
-test ! "$(hostname --fqdn)" = "$vm_fqdn"
-test ! "$(hostname --fqdn)" = "$vm_host"
 
 rule_help () {
        cat >&2 <<-EOF
@@ -33,10 +31,8 @@ rule_git_config () {
        git config --replace remote.$vm HEAD:refs/heads/origin
        )
  }
-rule_git_push () { # SYNTAX: $remote $options
+rule_git_push () { # SYNTAX: {host|vm} $git_commit_options
        local remote=${1#remote=}; shift
-       git add . &&
-       git commit -a -C HEAD "$@" &&
        GIT_SSH=./vm_ssh git push -v -f "$remote"
  }
 
@@ -58,7 +54,7 @@ rule_disk_key_send () {
         tee /lib/cryptsetup/passfifo \>/dev/null
  }
 rule_disk_key_backup () {
-       for part in root swap var home
+       for part in root var home
         do
                mkdir -p var/lib/luks
                rule_ssh -l root ' \
@@ -76,5 +72,12 @@ rule_disk_key_backup () {
 
 rule=${1:-help}
 ${1+shift}
-set "${TRACE:+-x}"
+case $rule in
+ (help);;
+ (*)
+       test ! "$(hostname --fqdn)" = "$vm_fqdn"
+       test ! "$(hostname --fqdn)" = "$vm_host"
+       ${TRACE:+set -x}
+       ;;
+ esac
 rule_$rule "$@"