From 5ad8982cfab2581d4d76e9dec9648d9307ebfe5f Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Tue, 1 Sep 2015 15:25:31 +0100
Subject: Fix firehose git config in firehose.configure

Change-Id: I09af760104ff5a25a374a1d74d7d0212906c171e
---
 firehose.configure | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/firehose.configure b/firehose.configure
index cde8b98..575dc1c 100644
--- a/firehose.configure
+++ b/firehose.configure
@@ -52,11 +52,6 @@ git-username = $GIT_USERNAME
 git-email = $GIT_EMAIL
 EOF
 
-# Become firehose user
-chroot "$ROOT" sudo -u "$GERRIT_USER" -s
-
 # Configure a git identity for Firehose
-cat >>"$ROOT/home/firehose/.gitconfig" <<EOF
-git config --global user.name "$GIT_USER"
-git config --global user.email "$GIT_EMAIL"
-EOF
+chroot "$ROOT" sudo -u "$GERRIT_USER" git config -f "/home/firehose/.gitconfig" user.name "$GIT_USER"
+chroot "$ROOT" sudo -u "$GERRIT_USER" git config -f "/home/firehose/.gitconfig" user.email "$GIT_EMAIL"
-- 
cgit v1.2.1