From fd13ef63517575a2732aba993b329fca41c9e8aa Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+burette@autogeree.net>
Date: Tue, 19 Feb 2013 16:13:37 +0100
Subject: [PATCH] Correction : vm_hosted : user_admin_add.

---
 vm_host   |  2 +-
 vm_hosted | 18 +++++++++---------
 vm_remote |  4 +---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/vm_host b/vm_host
index fc70bba..1577977 100755
--- a/vm_host
+++ b/vm_host
@@ -438,7 +438,7 @@ case $rule in
  (help);;
  (*)
 	test "$(hostname --fqdn)" = "$vm_host"
-	set "${TRACE:+-x}"
+	${TRACE:+set -x}
 	;;
  esac
 rule_$rule "$@"
diff --git a/vm_hosted b/vm_hosted
index 0514a43..6e7a847 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -220,12 +220,12 @@ rule__user_root_init () {
 	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
+	 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 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 \
@@ -821,7 +821,7 @@ case $rule in
  (help);;
  (*)
 	test "$(hostname --fqdn)" = "$vm_fqdn"
-	set "${TRACE:+-x}"
+	${TRACE:+set -x}
 	;;
  esac
 rule_$rule "$@"
diff --git a/vm_remote b/vm_remote
index 02b9540..987be13 100755
--- a/vm_remote
+++ b/vm_remote
@@ -33,8 +33,6 @@ rule_git_config () {
  }
 rule_git_push () { # SYNTAX: {host|vm} $git_commit_options
 	local remote=${1#remote=}; shift
-	git add . &&
-	git commit -a -C HEAD "$@" &&
 	GIT_SSH=./vm_ssh git push -v -f "$remote"
  }
 
@@ -79,7 +77,7 @@ case $rule in
  (*)
 	test ! "$(hostname --fqdn)" = "$vm_fqdn"
 	test ! "$(hostname --fqdn)" = "$vm_host"
-	set -x
+	${TRACE:+set -x}
 	;;
  esac
 rule_$rule "$@"
-- 
2.20.1