From: Julien Moutinho <julm+burette@autogeree.net>
Date: Tue, 19 Feb 2013 10:06:32 +0000 (+0100)
Subject: Correction : vm_* : help toujours accessible.
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=fdea46138aab165fff4ba27888c354c87190de9a

Correction : vm_* : help toujours accessible.
---

diff --git a/vm_host b/vm_host
index 0bf383d..d5d9277 100755
--- a/vm_host
+++ b/vm_host
@@ -3,7 +3,6 @@ set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
 . "$tool"/lib/functions.sh
 . "$tool"/etc/vm.sh
-test "$(hostname --fqdn)" = "$vm_host"
 
 rule_help () {
 	cat >&2 <<-EOF
@@ -434,5 +433,11 @@ rule__chroot_clean () {
 
 rule=${1:-help}
 ${1+shift}
-set "${TRACE:+-x}"
+case $rule in
+ (help);;
+ (*)
+	test "$(hostname --fqdn)" = "$vm_host"
+	set "${TRACE:+-x}"
+	;;
+ esac
 rule_$rule "$@"
diff --git a/vm_hosted b/vm_hosted
index 925f1a9..db7247a 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -3,7 +3,6 @@ set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
 . "$tool"/lib/functions.sh
 . "$tool"/etc/vm.sh
-test "$(hostname --fqdn)" = "$vm_fqdn"
 
 rule_help () {
 	cat >&2 <<-EOF
@@ -800,5 +799,11 @@ rule_mail_install () {
 
 rule=${1:-help}
 ${1+shift}
-set "${TRACE:+-x}"
+case $rule in
+ (help);;
+ (*)
+	test "$(hostname --fqdn)" = "$vm_fqdn"
+	set "${TRACE:+-x}"
+	;;
+ esac
 rule_$rule "$@"
diff --git a/vm_remote b/vm_remote
index 64f2ca1..65536b3 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
@@ -76,5 +74,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"
+	set "${TRACE:+-x}"
+	;;
+ esac
 rule_$rule "$@"