X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_host;h=de458ef89f228f258a31d8fa87d4338cbaa954e1;hb=5b3f6649997abf4786ec2b1292abf712d4358567;hp=e855630ea1ca7eac475455c9944cb283889eaf02;hpb=2cba0a711f2964a8eafdf4698939b296024d05e8;p=lhc%2Fateliers.git

diff --git a/vm_host b/vm_host
index e855630..de458ef 100755
--- a/vm_host
+++ b/vm_host
@@ -1,8 +1,9 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
-. "$tool"/lib/functions.sh
+. "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
+. "$tool"/lib/mk.sh
 
 rule_help () { # SYNTAX: [--hidden]
 	local hidden; [ ${1:+set} ] || hidden=set
@@ -44,7 +45,7 @@ rule_git_reset () {
 	)
  }
 
-rule_vm_init () {
+rule_vm_configure () {
 	mk_reg mod=644 own=root:root /etc/xen/$vm_fqdn.cfg <<-EOF
 		#  -*- mode: python; -*-
 		# DOC: http://wiki.xen.org/wiki/Xen_Linux_PV_on_HVM_drivers
@@ -92,9 +93,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 +282,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
@@ -449,7 +445,6 @@ case $rule in
  (help);;
  (*)
 	assert 'test "$(hostname --fqdn)" = "$vm_host"' vm_host
-	${TRACE:+set -x}
 	;;
  esac
 rule $rule "$@"