Modification : mk_{dir,reg} -> install .

[lhc/ateliers.git] / vm_host

diff --git a/vm_host b/vm_host
index c42fc1c..7c521e4 100755 (executable)
--- a/vm_host
+++ b/vm_host
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
-. "$tool"/lib/functions.sh
+. "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
 
 rule_help () { # SYNTAX: [--hidden]
@@ -45,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
@@ -92,9 +92,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 () {
@@ -283,9 +281,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