X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_remote;h=946706a09c2175bcb7b4986921a293316c427ca4;hb=5020fb59510a981bd021e5d34fee268d26eb40a0;hp=64f2ca1ff8bf499dacc56db7b3ff62abc606d8c3;hpb=2004b5241b88976b7090538c214a0bc881d7e785;p=lhc%2Fateliers.git

diff --git a/vm_remote b/vm_remote
index 64f2ca1..946706a 100755
--- 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,13 @@ 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" ||
+	error 1 "mauvaise machine"
+	${TRACE:+set -x}
+	;;
+ esac
 rule_$rule "$@"