From 36f68a87aac099e21c72cbf1444ceaf75333e47c Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+burette@autogeree.net>
Date: Sat, 23 Mar 2013 21:54:55 +0100
Subject: [PATCH] =?utf8?q?Modification=20:=20vm=5Fremote=20:=20rule=5Fgit?=
 =?utf8?q?=5Fconfigure=20:=20stockage=20du=20d=C3=A9p=C3=B4t=20distant=20d?=
 =?utf8?q?ans=20notre=20propre=20maison.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 etc/bash.bashrc |  2 ++
 vm_host         | 31 ++++++++++++++++---------------
 vm_hosted       |  2 --
 vm_remote       |  4 ++--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/etc/bash.bashrc b/etc/bash.bashrc
index 02386c8..e4c413d 100644
--- a/etc/bash.bashrc
+++ b/etc/bash.bashrc
@@ -121,6 +121,8 @@ alias setfacl='setfacl --no-mask'
 alias sl='ls'
 alias vi='vim'
 alias vim='vim -p'
+alias vm_hosted='~/src/vm/vm_hosted'
+alias vm='vm_hosted'
 alias :e='vim'
 alias :q='exit'
 
diff --git a/vm_host b/vm_host
index 4ad1c38..04dcc26 100755
--- a/vm_host
+++ b/vm_host
@@ -256,15 +256,16 @@ rule_part_root_format () {
 		 /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
@@ -412,19 +413,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
+		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 ||
diff --git a/vm_hosted b/vm_hosted
index b68dc3d..bd3d1cc 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -34,8 +34,6 @@ rule_git_configure () {
 	git config --replace branch.master.merge refs/remotes/master
 	local tool
 	tool=$(cd "$tool"; cd -)
-	sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/
-	sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/vm
 	sudo install -m 770 /dev/stdin .git/hooks/post-update <<-EOF
 		#!/bin/sh -efux
 		case \$1 in
diff --git a/vm_remote b/vm_remote
index 57a3e96..0fa0165 100755
--- a/vm_remote
+++ b/vm_remote
@@ -27,10 +27,10 @@ rule_git_configure () { # DESCRIPTION: configure ./.git correctement
 	(
 	cd "$tool"
 	git remote rm host || true
-	git remote add host $vm_host:tool/vm
+	git remote add host $vm_host:src/vm
 	git config --replace remote.host.push HEAD:refs/remotes/master
 	git remote rm hosted || true
-	git remote add hosted root@$vm_fqdn:tool/vm
+	git remote add hosted $vm_fqdn:src/vm
 	git config --replace remote.hosted.push HEAD:refs/remotes/master
 	git submodule update --init
 	)
-- 
2.20.1