Ajout : TODO.

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index 0514a43..be651b0 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -219,13 +219,13 @@ rule__user_root_init () {
        mk_lnk etc/gpg /root/.gnupg
        mk_lnk etc/ssh /root/.ssh
        getent group sudo |
-       while IFS=: read -r group x x users
-        do while IFS=, read -r user
-                do eval local home\; home="~$user"
-                       cat "$home"/etc/ssh/authorized_keys
-                done <<-EOF
+       while test -n "$users" && IFS=: read -r group x x users
+        do while IFS=, read -r user users <<-EOF
                        $users
                        EOF
+                do eval local home\; home="~$user"
+                       cat "$home"/etc/ssh/authorized_keys
+                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 {} \;
@@ -278,12 +278,12 @@ rule__initramfs_init () {
         /etc/initramfs-tools/root/.ssh
        getent group sudo |
        while IFS=: read -r group x x users
-        do while IFS=, read -r user
-                do eval local home\; home="~$user"
-                       cat "$home"/etc/ssh/authorized_keys
-                done <<-EOF
+        do while test -n "$users" && IFS=, read -r user users <<-EOF
                        $users
                        EOF
+                do eval local home\; home="~$user"
+                       cat "$home"/etc/ssh/authorized_keys
+                done
         done |
        mk_reg mod=644 own=root:root /etc/initramfs-tools/root/.ssh/authorized_keys
        sudo rm -f \
@@ -447,8 +447,9 @@ 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 {} \;
+       find "$tool"/var/pub/openpgp \
+        -type f -name '*.key' -exec \
+        sudo -u "$user" gpg --import {} \;
  }
 rule_user_mail_format () {
        mk_dir mod=770 own=root:adm /etc/skel/etc/procmail
@@ -821,7 +822,7 @@ case $rule in
  (help);;
  (*)
        test "$(hostname --fqdn)" = "$vm_fqdn"
-       set "${TRACE:+-x}"
+       ${TRACE:+set -x}
        ;;
  esac
 rule_$rule "$@"