X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_host;h=fc70bbaa5b39bbfa3a75216c0c475f3243b20252;hb=95955dc2c60de318b36d09e22494c7841fbc6f1a;hp=f754547b6869fece6e3286735992165baab35dc5;hpb=1f1550e467bccfbac8a8f88b93db6355745794be;p=lhc%2Fateliers.git

diff --git a/vm_host b/vm_host
index f754547..fc70bba 100755
--- a/vm_host
+++ b/vm_host
@@ -1,9 +1,8 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
-. "$tool"/functions.sh
-. "$tool"/vm.sh
-test "$(hostname --fqdn)" = "$vm_host"
+. "$tool"/lib/functions.sh
+. "$tool"/etc/vm.sh
 
 rule_help () {
 	cat >&2 <<-EOF
@@ -359,6 +358,7 @@ rule_debian_install () {
 		 dnsutils \
 		 dropbear \
 		 etckeeper \
+		 git-core \
 		 gnupg \
 		 hashalot \
 		 htop \
@@ -434,5 +434,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 "$@"