summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2014-12-25 20:29:05 +0200
committerLars Wirzenius <liw@liw.fi>2014-12-25 20:29:05 +0200
commit86f1fd5d0b8e51df63adb47d3a6fce05ead2fa03 (patch)
treee78850faa8c5a78f89fb4046b2eed14bbf410fbb
parent7b723b51ce061a6a5617552969e0a4c55e57dd0c (diff)
downloadjenkinstool-86f1fd5d0b8e51df63adb47d3a6fce05ead2fa03.tar.gz
Fix file locations
-rwxr-xr-xvm-create8
1 files changed, 4 insertions, 4 deletions
diff --git a/vm-create b/vm-create
index cbc9ac7..d127f1b 100755
--- a/vm-create
+++ b/vm-create
@@ -21,7 +21,7 @@
set -eux
PATH="$PATH:/home/liw/vmdebootstrap/vmdebootstrap"
-VMTMP="/mnt/scratch/liw-scratch/jenkinstool-images"
+VMTMP="/big/scratch/jenkinstool-images-new"
# Create the SSH host and user keys.
for key in jenkins.host-key jenkins.user-key worker.host-key worker.user-key
@@ -40,11 +40,11 @@ for flavor in \
sid-amd64 sid-i386
do
conf="vm-data/$flavor.conf"
- img="$VMTMP"/$(awk '$1 ~ /^image[:=]?/ { print $NF }' "$conf")
+ img="$VMTMP/$flavor.img"
if [ ! -e "$img" ]
then
- vmdebootstrap --config vm-data/common.conf --config "$conf" \
+ vmdebootstrap \
+ --config vm-data/common.conf --config "$conf" \
--image "$img" "$@"
fi
done
-