Mise-à-jour : TODO .

[lhc/ateliers.git] / vm_host

diff --git a/vm_host b/vm_host
index de458ef..04dcc26 100755 (executable)
--- a/vm_host
+++ b/vm_host
@@ -3,7 +3,6 @@ set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
 . "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
-. "$tool"/lib/mk.sh
 
 rule_help () { # SYNTAX: [--hidden]
        local hidden; [ ${1:+set} ] || hidden=set
@@ -46,7 +45,7 @@ rule_git_reset () {
  }
 
 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
@@ -249,23 +248,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
@@ -413,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 ||