Fix up the FIO updater, update host names to current reality

Change-Id: I69c5e882ec75b9d4d51dc856721b00c9a11ef0c2
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

3 files changed, 4 insertions, 4 deletions

diff --git a/fio.sh b/fio.sh
index 1ab1f39..93adfdf 100755
--- a/fio.sh
+++ b/fio.sh
@@ -21,7 +21,7 @@ else
 	git checkout -b linaro-upstream-work-$TIMESTAMP aosp/master
 fi
 
-if git merge $V -m "Merge update to $V"; then
+if git merge fio-$V -m "Merge update to $V"; then
 	notice "Auto-updated fio to $V."
 else
 	error "Couldn't auto-update fio - updates failed to merge."
diff --git a/functions b/functions
index 2174508..14d6ecf 100644
--- a/functions
+++ b/functions
@@ -45,7 +45,7 @@ checkout() {
 	mkdir -p $D
 	cd $D
 	rm -rf $B
-	git clone ssh://$USER@android.git.linaro.org:29418/$1.git
+	git clone ssh://$USER@android-review.linaro.org:29418/$1.git
 	cd $B
 	[ -n "$NAME" ] && git config user.name $NAME
 	[ -n "$EMAIL" ] && git config user.email $EMAIL
diff --git a/settings b/settings
index 26d4ae0..7207596 100644
--- a/settings
+++ b/settings
@@ -1,8 +1,8 @@
 #!/bin/sh
 # Path to Linaro AOSP sources (will be created if necessary)
-SRC=/mnt/hd/src/linaro-android/src
+SRC=/media/4tb/repos/linaro-android/src
 # Username for android.git.linaro.org write access
-USER=bero
+USER=bernhard.rosenkranzer
 # Optionally, specify NAME= for use with git user.name
 # Email address to use for git user.email
 EMAIL=Bernhard.Rosenkranzer@linaro.org