X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_host;h=4ad1c38bdb057caa6d3adb3b12fcf33cdf933770;hb=f908591b3c705b257eacf8f0c6096f16f251d966;hp=de458ef89f228f258a31d8fa87d4338cbaa954e1;hpb=7313fbbd10b0321c3e460639137f0e0e9ed9dcad;p=lhc%2Fateliers.git

diff --git a/vm_host b/vm_host
index de458ef..4ad1c38 100755
--- 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,8 +248,8 @@ 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 \