Modification : polissage et log

[lhc/ateliers.git] / vm_host

diff --git a/vm_host b/vm_host
index 0a2649d..f5c6eaf 100755 (executable)
--- a/vm_host
+++ b/vm_host
@@ -12,10 +12,10 @@ rule_help () {
                             Voir \`$tool/vm_hosted' pour les utilitaires côté VM hébergée.
                SYNTAX: $0 \$RULE \${RULE}_SYNTAX
                RULES:
-               $(sed -ne 's/^rule_\([^_][^ ]*\) () {\( *#.*\|\)/\t\1\2/p' "$tool"/vm.sh "$0")
+               $(sed -ne 's/^rule_\([^_][^ ]*\) () {\( *#.*\|\)/\t\1\2/p' "$tool"/etc/vm.sh "$0")
                ENVIRONMENT:
                  TRACE # affiche les commandes avant leur exécution
-               $(sed -ne 's/^readonly \([^ ][^ =]*\).*}\( *#.*\|\)$/\t$\1\2/p' "$tool"/vm.sh "$0")
+               $(sed -ne 's/^readonly \([^ ][^ =]*\).*}\( *#.*\|\)$/\t$\1\2/p' "$tool"/etc/vm.sh "$0")
                EOF
  }
 
@@ -78,7 +78,7 @@ rule_vm_init () {
 rule_vm_start () {
        test ! -e /dev/domU/$vm_fqdn-disk1
        sudo xm create $vm_fqdn.cfg
-       rule_vm_attach
+       rule vm_attach
  }
 rule_vm_attach () {
        cat <<-EOF
@@ -98,15 +98,15 @@ rule_disk_mount () { # DESCRIPTION: montage du disque de la VM depuis l'hôte
        #sudo xm block-attach 0 phy:/dev/domU/$vm_fqdn-disk $vm_dev_disk w
  }
 rule_disk_umount () { # DESCRIPTION: démontage du disque de la VM depuis l'hôte
-       rule_part_boot_umount
+       rule part_boot_umount
        case $vm_use_lvm in
         (yes)
-               rule_part_lvm_umount
+               rule part_lvm_umount
                ;;
         (no)
-               rule_part_root_umount
-               rule_part_var_umount
-               rule_part_home_umount
+               rule part_root_umount
+               rule part_var_umount
+               rule part_home_umount
                ;;
         (*) exit 1;;
         esac
@@ -171,7 +171,7 @@ rule_disk_format () { # DESCRIPTION: partitionnage du disque de la VM
  }
 
 rule_part_lvm_format () {
-       rule_part_lvm_umount
+       rule part_lvm_umount
        ! sudo vgs | grep -q "^  $vm_lvm_vg " ||
        sudo vgremove $vm_lvm_vg
        sudo pvcreate --dataalignment 512k $vm_lvm_pv
@@ -180,7 +180,7 @@ rule_part_lvm_format () {
        sudo lvcreate --contiguous y -n ${vm_lvm_lv}_root -L 15G     $vm_lvm_vg
        sudo lvcreate --contiguous y -n ${vm_lvm_lv}_var  -L  5G     $vm_lvm_vg
        sudo lvcreate --contiguous y -n ${vm_lvm_lv}_home -l 99%FREE $vm_lvm_vg
-       rule_part_lvm_umount
+       rule part_lvm_umount
  }
 rule_part_lvm_mount () {
        case $vm_use_lvm in
@@ -193,9 +193,9 @@ rule_part_lvm_mount () {
 rule_part_lvm_umount () {
        case $vm_use_lvm in
         (yes)
-               rule_part_root_umount
-               rule_part_var_umount
-               rule_part_home_umount
+               rule part_root_umount
+               rule part_var_umount
+               rule part_home_umount
                ! sudo vgs | grep -q "^  $vm_lvm_vg " ||
                sudo vgchange -a n $vm_lvm_vg
                ;;
@@ -276,11 +276,11 @@ 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
+       rule _part_encrypted_format swap
+       rule _part_encrypted_mount  swap
        sudo mkswap -f -L ${vm_lvm_lv}_swap \
         /dev/mapper/${vm_lvm_lv}_swap_deciphered
-       rule__part_encrypted_umount swap
+       rule _part_encrypted_umount swap
  }
 rule_part_boot_format () {
        mount | grep -q "^$vm_dev_disk_boot " ||
@@ -299,51 +299,51 @@ rule_part_boot_umount () {
        sudo umount -v  /mnt/$vm_fqdn/boot
  }
 rule_part_var_format () {
-       rule__part_encrypted_format var
-       rule__part_encrypted_mount  var
+       rule _part_encrypted_format var
+       rule _part_encrypted_mount  var
        sudo mke2fs -t ext4 -c -c -m 5 -T ext4 -b $vm_e2fs_block_size \
         -E resize=10G${vm_e2fs_extended_options} \
         -L ${vm_lvm_lv}_var \
         /dev/mapper/${vm_lvm_lv}_var_deciphered
-       rule__part_encrypted_umount var
+       rule _part_encrypted_umount var
  }
 rule_part_var_mount () {
-       rule__part_encrypted_mount var
+       rule _part_encrypted_mount var
        mountpoint -q /mnt/$vm_fqdn/var ||
        sudo mount -v -t ext4 /dev/mapper/${vm_lvm_lv}_var_deciphered /mnt/$vm_fqdn/var
  }
 rule_part_var_umount () {
        ! mountpoint -q /mnt/$vm_fqdn/var ||
        sudo umount -v  /mnt/$vm_fqdn/var
-       rule__part_encrypted_umount var
+       rule _part_encrypted_umount var
  }
 rule_part_home_format () {
-       rule__part_encrypted_format home
-       rule__part_encrypted_mount  home
+       rule _part_encrypted_format home
+       rule _part_encrypted_mount  home
        sudo mke2fs -t ext4 -c -c -m 0 -T ext4 -b $vm_e2fs_block_size \
         -E resize=400G${vm_e2fs_extended_options} \
         -L ${vm_lvm_lv}_home \
         /dev/mapper/${vm_lvm_lv}_home_deciphered
         # NOTE: -O quota pas supporté par e2fsprogs/squeeze
-       rule__part_encrypted_umount home
+       rule _part_encrypted_umount home
  }
 rule_part_home_mount () {
-       rule__part_encrypted_mount home
+       rule _part_encrypted_mount home
        mountpoint -q /mnt/$vm_fqdn/home ||
        sudo mount -v -t ext4 /dev/mapper/${vm_lvm_lv}_home_deciphered /mnt/$vm_fqdn/home
  }
 rule_part_home_umount () {
        ! mountpoint -q /mnt/$vm_fqdn/home ||
        sudo umount -v  /mnt/$vm_fqdn/home
-       rule__part_encrypted_umount home
+       rule _part_encrypted_umount home
  }
 
 rule_debian_install () {
-       rule_disk_mount
-       rule_part_lvm_mount
-       rule_part_root_mount
-       rule_part_boot_mount
-       rule_part_var_mount
+       rule disk_mount
+       rule part_lvm_mount
+       rule part_root_mount
+       rule part_boot_mount
+       rule part_var_mount
        sudo DEBOOTSTRAP_DIR=/usr/share/debootstrap/ LANG=C LC_CTYPE=C debootstrap \
         --arch=$vm_arch --verbose --keyring=/usr/share/keyrings/debian-archive-keyring.gpg \
         --exclude=vim-tiny \
@@ -388,17 +388,17 @@ rule_debian_install () {
         ) \
         $vm_lsb_name /mnt/$vm_fqdn/ \
         http://ftp.fr.debian.org/debian/
-       rule_part_var_umount
-       rule_part_boot_umount
-       rule_part_root_umount
+       rule part_var_umount
+       rule part_boot_umount
+       rule part_root_umount
  }
 
 rule_chroot () {
-       rule_disk_mount
-       rule_part_lvm_mount
-       rule_part_root_mount
-       rule_part_boot_mount
-       rule_part_var_mount
+       rule disk_mount
+       rule part_lvm_mount
+       rule part_root_mount
+       rule part_boot_mount
+       rule part_var_mount
        #rule_part_home_mount
        mountpoint -q /mnt/$vm_fqdn/proc ||
        sudo mount -t proc proc /mnt/$vm_fqdn/proc
@@ -414,7 +414,7 @@ rule_chroot () {
                rsync -a "$tool"/ /mnt/$vm_fqdn/root/tool/vm
         fi
        sudo chroot /mnt/$vm_fqdn /bin/bash || true
-       rule__chroot_clean
+       rule _chroot_clean
  }
 rule__chroot_clean () {
        ! sudo mountpoint -q /mnt/$vm_fqdn/root/tool/vm ||
@@ -425,11 +425,11 @@ rule__chroot_clean () {
        sudo umount -v /mnt/$vm_fqdn/sys
        ! mountpoint -q /mnt/$vm_fqdn/proc ||
        sudo umount -v /mnt/$vm_fqdn/proc
-       rule_part_home_umount
-       rule_part_var_umount
-       rule_part_boot_umount
-       rule_part_root_umount
-       rule_disk_umount
+       rule part_home_umount
+       rule part_var_umount
+       rule part_boot_umount
+       rule part_root_umount
+       rule disk_umount
  }
 
 rule=${1:-help}
@@ -437,9 +437,8 @@ ${1+shift}
 case $rule in
  (help);;
  (*)
-       test "$(hostname --fqdn)" = "$vm_host" ||
-       error 1 "mauvaise machine"
+       assert 'test "$(hostname --fqdn)" = "$vm_host"' vm_host
        ${TRACE:+set -x}
        ;;
  esac
-rule_$rule "$@"
+rule $rule "$@"