X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_host;h=8bbe166029906fff3faac667da21ee523ac8756d;hp=c42fc1c8f2e553fd5b1ae4e463027077f75dd64f;hb=7343218cce2a1d7845ab90df70ad894ba9e5b79a;hpb=a0db32961c20b1a9a404d28a8ba4932808f386af

diff --git a/vm_host b/vm_host
index c42fc1c..8bbe166 100755
--- a/vm_host
+++ b/vm_host
@@ -1,8 +1,9 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
-. "$tool"/lib/functions.sh
+. "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
+export TRACE=1
 
 rule_help () { # SYNTAX: [--hidden]
 	local hidden; [ ${1:+set} ] || hidden=set
@@ -25,27 +26,31 @@ 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
 	)
  }
 
 rule_vm_configure () {
-	mk_reg mod=644 own=root:root /etc/xen/$vm_fqdn.cfg <<-EOF
+	sudo install -m 644 -u root -g root /dev/stdin /etc/xen/$vm_fqdn.cfg <<-EOF
 		#  -*- mode: python; -*-
 		# DOC: http://wiki.xen.org/wiki/Xen_Linux_PV_on_HVM_drivers
 		import os, re
@@ -92,9 +97,7 @@ rule_vm_start () {
  }
 rule_vm_attach () {
 	assert '! pgrep -f "sudo xm console $vm_fqdn"'
-	cat <<-EOF
-		NOTE: Ctrl-] pour se détacher de la console
-		EOF
+	info 'Ctrl-] pour se détacher de la console'
 	sudo xm console $vm_fqdn
  }
 rule_vm_stop () {
@@ -250,23 +253,24 @@ rule_part_root_format () {
 	if ! mount | grep -q "^$vm_dev_disk_root "
 	 then
 		sudo cryptsetup luksFormat --hash=sha512 --key-size=512 \
-		 --cipher=aes-xts-essiv:sha256 --key-file=- --align-payload=8 $vm_dev_disk_root
-		sudo cryptsetup luksOpen --key-file=- $vm_dev_disk_root ${vm_lvm_lv}_root_deciphered
+		 --cipher=aes-xts-essiv:sha256 --align-payload=8 $vm_dev_disk_root
+		sudo cryptsetup luksOpen $vm_dev_disk_root ${vm_lvm_lv}_root_deciphered
 		sudo mke2fs -t ext4 -c -c -m 5 -T ext4 -b $vm_e2fs_block_size \
 		 -E resize=30G${vm_e2fs_extended_options} \
 		 -L ${vm_lvm_lv}_root \
 		 /dev/mapper/${vm_lvm_lv}_root_deciphered
 		! mountpoint -q /mnt/$vm_fqdn
 		sudo mount -v /dev/mapper/${vm_lvm_lv}_root_deciphered /mnt/$vm_fqdn
-		mk_dir mod=0770 own=root:root /mnt/$vm_fqdn/boot
-		mk_dir mod=0770 own=root:root /mnt/$vm_fqdn/dev
-		mk_dir mod=0770 own=root:root /mnt/$vm_fqdn/home
-		mk_dir mod=0770 own=root:root /mnt/$vm_fqdn/proc
-		mk_dir mod=0770 own=root:root /mnt/$vm_fqdn/sys
-		mk_dir mod=0770 own=root:root /mnt/$vm_fqdn/var
-		mk_dir mod=0770 own=root:root /mnt/$vm_fqdn/root
-		mk_dir mod=0770 own=root:root /mnt/$vm_fqdn/root/tool
-		mk_dir mod=0770 own=root:root /mnt/$vm_fqdn/root/tool/ateliers
+		sudo install -d -m 770 -o root -g root \
+		 /mnt/$vm_fqdn/boot \
+		 /mnt/$vm_fqdn/dev \
+		 /mnt/$vm_fqdn/home \
+		 /mnt/$vm_fqdn/proc \
+		 /mnt/$vm_fqdn/root \
+		 /mnt/$vm_fqdn/root/src \
+		 /mnt/$vm_fqdn/root/src/$vm \
+		 /mnt/$vm_fqdn/sys \
+		 /mnt/$vm_fqdn/var
 		sudo umount -v /mnt/$vm_fqdn
 		sudo cryptsetup luksClose ${vm_lvm_lv}_root_deciphered
 	 fi
@@ -283,9 +287,6 @@ rule_part_root_umount () {
 	! test -e     /dev/mapper/${vm_lvm_lv}_root_deciphered ||
 	sudo cryptsetup luksClose ${vm_lvm_lv}_root_deciphered
  }
-rule_part_root_backup_luks () {
-	sudo cryptsetup luksHeaderBackup $vm_dev_disk_root --header-backup-file ./root.luks
- }
 rule_part_swap_format () {
 	rule _part_encrypted_format swap
 	rule _part_encrypted_mount  swap
@@ -379,6 +380,7 @@ rule_debian_install () {
 		 less \
 		 locales \
 		 lvm2 \
+		 m4 \
 		 mosh \
 		 molly-guard \
 		 ncurses-term \
@@ -417,19 +419,19 @@ rule_chroot () {
 	sudo mount -t sysfs sys /mnt/$vm_fqdn/sys
 	mountpoint -q /mnt/$vm_fqdn/dev ||
 	sudo mount --bind /dev /mnt/$vm_fqdn/dev
-	if test -d /mnt/$vm_fqdn/root/tool/vm/.git
+	if test -d /mnt/$vm_fqdn/root/src/vm/.git
 	 then
-		mountpoint -q /mnt/$vm_fqdn/root/tool/vm ||
-		sudo mount --bind "$tool" /mnt/$vm_fqdn/root/tool/vm
+		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/tool/vm
+		sudo rsync -a "$tool"/ /mnt/$vm_fqdn/root/src/vm
 	 fi
 	sudo chroot /mnt/$vm_fqdn /bin/bash || true
 	rule _chroot_clean
  }
 rule__chroot_clean () {
-	! sudo mountpoint -q /mnt/$vm_fqdn/root/tool/vm ||
-	sudo umount -v /mnt/$vm_fqdn/root/tool/$vm
+	! sudo mountpoint -q /mnt/$vm_fqdn/root/src/vm ||
+	sudo umount -v /mnt/$vm_fqdn/root/src/vm
 	! mountpoint -q /mnt/$vm_fqdn/dev ||
 	sudo umount -v /mnt/$vm_fqdn/dev
 	! mountpoint -q /mnt/$vm_fqdn/sys ||