Mise-à-jour : TODO .

[lhc/ateliers.git] / vm_host

diff --git a/vm_host b/vm_host
index 4ad1c38..04dcc26 100755 (executable)
--- 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 ||