X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_host;h=d8224ecaa4026f0106947b35470b0fefa12fbc23;hp=dfbaa517fa2230e222db17d5c5ce30b4eaf525ad;hb=539fcb191f524c0ee86c58c98a091b09b1fca7bc;hpb=fe76c838090f262ec477c6a73d1bf9d988033b56

diff --git a/vm_host b/vm_host
index dfbaa51..d8224ec 100755
--- a/vm_host
+++ b/vm_host
@@ -35,10 +35,10 @@ rule_git_config () {
 rule_git_reset () {
 	(
 	cd "$tool"
-	#git checkout -f -B master origin
+	#git checkout -f -B master remotes/master
 	# NOTE: pas de -B sous squeeze
 	git checkout HEAD'^' &&
-	git branch -f master origin &&
+	git branch -f master remotes/master &&
 	git checkout master
 	git clean -f -d -x
 	)
@@ -91,6 +91,7 @@ rule_vm_start () {
 	rule vm_attach
  }
 rule_vm_attach () {
+	assert '! pgrep -f "sudo xm console $vm_fqdn"'
 	cat <<-EOF
 		NOTE: Ctrl-] pour se détacher de la console
 		EOF
@@ -214,33 +215,33 @@ rule_part_lvm_umount () {
  }
 
 rule_part_randomize () { # SYNTAX: $part # NOTE: à anticiper
-	local part=$1
+	local part="$1"
 	eval "sudo dd if=/dev/urandom of=\$vm_dev_disk_$part"
  }
 rule_part_randomize_stat () { # SYNTAX: $part # DESCRIPTION: fait afficher la progression de rule_part_randomize
-	local part=$1
+	local part="$1"
 	eval "pkill -USR1 -f \"^dd if=/dev/urandom of=\$vm_dev_disk_$part\""
  }
 rule__part_encrypted_format () { # SYNTAX: $part # DESCRIPTION: formatage d'une partition distincte de /
  # NOTE: la clef de chiffrement est dérivée de celle de /,
  #       / doit être déchiffrée pour que cela fonctionne.
-	local part=$1
-	eval "local dev=\$vm_dev_disk_$part"
+	local part="$1"
+	eval "local dev=\"\$vm_dev_disk_$part\""
 	test ! -e /dev/mapper/${vm_lvm_lv}_root_deciphered ||
 	sudo /bin/sh -c "/lib/cryptsetup/scripts/decrypt_derived ${vm_lvm_lv}_root_deciphered |
 	cryptsetup luksFormat --hash=sha512 --key-size=512 \
 	 --cipher=aes-xts-essiv:sha256 --key-file=- --align-payload=8 $dev"
  }
 rule__part_encrypted_mount () { # SYNTAX: $part
-	local part=$1
-	eval "local dev=\$vm_dev_disk_$part"
+	local part="$1"
+	eval "local dev=\"\$vm_dev_disk_$part\""
 	test -e /dev/mapper/${vm_lvm_lv}_${part}_deciphered ||
 	sudo /bin/sh -c "/lib/cryptsetup/scripts/decrypt_derived ${vm_lvm_lv}_root_deciphered |
 	cryptsetup luksOpen --key-file=- $dev ${vm_lvm_lv}_${part}_deciphered"
  }
 rule__part_encrypted_umount () { # SYNTAX: $part
-	local part=$1
-	eval "local dev=\$vm_dev_disk_$part"
+	local part="$1"
+	eval "local dev=\"\$vm_dev_disk_$part\""
 	test ! -e     /dev/mapper/${vm_lvm_lv}_${part}_deciphered ||
 	sudo cryptsetup luksClose ${vm_lvm_lv}_${part}_deciphered
  }
@@ -448,7 +449,6 @@ case $rule in
  (help);;
  (*)
 	assert 'test "$(hostname --fqdn)" = "$vm_host"' vm_host
-	${TRACE:+set -x}
 	;;
  esac
 rule $rule "$@"