X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=ebb930de6e5a5c37daa97af861853a4ea3d103e7;hb=5020fb59510a981bd021e5d34fee268d26eb40a0;hp=b2110631893683b69544ad3bdde38d05a9476b50;hpb=ce982427bc9f7befe6f0eb640ce7eb54f17cf778;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index b211063..ebb930d 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -228,7 +228,10 @@ rule__user_root_init () {
 		 done
 	 done |
 	mk_reg mod=640 own=root:root /root/etc/ssh/authorized_keys
-	sudo find "$tool"/var/pub/openpgp -type f -name '*.key' -exec gpg --import {} \;
+	local key
+	for key in "$tool"/var/pub/openpgp/*.key
+	 do sudo gpg --import "$key"
+	 done
  }
 rule__initramfs_init () {
 	mk_reg mod=644 own=root:root /etc/initramfs-tools/initramfs.conf <<-EOF
@@ -447,8 +450,10 @@ rule_user_admin_add () { # SYNTAX: $user
 	 <"$tool"/var/pub/ssh/"$user".key
 	rule__initramfs_init
 	rule__user_root_init
-	sudo -u "$user" find "$tool"/var/pub/openpgp \
-	 -type f -name '*.key' -exec gpg --import {} \;
+	local key; local -; set +f
+	for key in "$tool"/var/pub/openpgp/*.key
+	 do sudo -u "$user" gpg --import "$key"
+	 done
  }
 rule_user_mail_format () {
 	mk_dir mod=770 own=root:adm /etc/skel/etc/procmail
@@ -820,7 +825,8 @@ ${1+shift}
 case $rule in
  (help);;
  (*)
-	test "$(hostname --fqdn)" = "$vm_fqdn"
+	test "$(hostname --fqdn)" = "$vm_fqdn" ||
+	error 1 "mauvaise machine"
 	${TRACE:+set -x}
 	;;
  esac