X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_host;h=8bbe166029906fff3faac667da21ee523ac8756d;hp=04dcc26083cd5e907405e8ff44c401959df63695;hb=22f04b9fac14adc3d3fc98273ba126c3a51792c3;hpb=36f68a87aac099e21c72cbf1444ceaf75333e47c

diff --git a/vm_host b/vm_host
index 04dcc26..8bbe166 100755
--- a/vm_host
+++ b/vm_host
@@ -3,6 +3,7 @@ set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
 . "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
+export TRACE=1
 
 rule_help () { # SYNTAX: [--hidden]
 	local hidden; [ ${1:+set} ] || hidden=set
@@ -25,22 +26,26 @@ rule_help () { # SYNTAX: [--hidden]
 readonly vm_dev_disk=/dev/mapper/domU-$(printf %s "$vm_fqdn-disk" | sed -e 's/-/--/g')
 readonly vm_dev_disk_boot="${vm_dev_disk}1"
 
-rule_git_config () {
+rule_git_configure () {
 	(
 	cd "$tool"
 	git config --replace branch.master.remote .
 	git config --replace branch.master.merge refs/remotes/master
-	)
- }
-rule_git_reset () {
-	(
-	cd "$tool"
-	#git checkout -f -B master remotes/master
-	# NOTE: pas de -B sous squeeze
-	git checkout HEAD'^' &&
-	git branch -f master remotes/master &&
-	git checkout master
-	git clean -f -d -x
+	local tool
+	tool=$(cd "$tool"; cd -)
+	install -m 770 /dev/stdin .git/hooks/post-update <<-EOF
+		#!/bin/sh -efux
+		case \$1 in
+		 (refs/remotes/master)
+			cd ..
+			#git --git-dir=\$PWD/.git checkout -f -B master remotes/master &&
+			git --git-dir=\$PWD/.git checkout HEAD'^' &&
+			git --git-dir=\$PWD/.git branch -f master remotes/master &&
+			git --git-dir=\$PWD/.git checkout master
+			git --git-dir=\$PWD/.git clean -f -d -x
+			;;
+		 esac
+		EOF
 	)
  }
 
@@ -375,6 +380,7 @@ rule_debian_install () {
 		 less \
 		 locales \
 		 lvm2 \
+		 m4 \
 		 mosh \
 		 molly-guard \
 		 ncurses-term \
@@ -418,7 +424,7 @@ rule_chroot () {
 		mountpoint -q /mnt/$vm_fqdn/root/src/vm ||
 		sudo mount --bind "$tool" /mnt/$vm_fqdn/root/src/vm
 	 else
-		rsync -a "$tool"/ /mnt/$vm_fqdn/root/src/vm
+		sudo rsync -a "$tool"/ /mnt/$vm_fqdn/root/src/vm
 	 fi
 	sudo chroot /mnt/$vm_fqdn /bin/bash || true
 	rule _chroot_clean