From bfbdb6a33d63e48287facd92ab13682ede5ae324 Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Mon, 11 May 2015 19:41:20 -0700
Subject: [PATCH] oem/ami: minor fixes

---
 oem/ami/import.sh   | 2 +-
 oem/ami/test_ami.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/oem/ami/import.sh b/oem/ami/import.sh
index 901cff6689..7b60759a7f 100755
--- a/oem/ami/import.sh
+++ b/oem/ami/import.sh
@@ -122,7 +122,7 @@ export EC2_URL="https://ec2.${region}.amazonaws.com"
 echo "Building AMI in zone ${EC2_IMPORT_ZONE}"
 
 tmpimg=$(mktemp)
-trap "rm -f '${dldir}'" EXIT
+trap "rm -f '${tmpimg}'" EXIT
 
 # if it is on the local fs, just use it, otherwise try to download it
 if [[ -n "$IMG_PATH" ]]; then
diff --git a/oem/ami/test_ami.sh b/oem/ami/test_ami.sh
index 90208ce678..9bf684f8bb 100755
--- a/oem/ami/test_ami.sh
+++ b/oem/ami/test_ami.sh
@@ -150,7 +150,7 @@ declare -a ips=($($ec2_cmd | grep INSTANCE | cut -f4))
 # sleep until all the sockets we need come up
 for host in ${ips[@]}; do
     for port in 22 4001 7001; do
-        timeout 120 perl -MIO::Socket::INET -e "
+        timeout 300 perl -MIO::Socket::INET -e "
             until(new IO::Socket::INET('$host:$port')){sleep 1}"
     done
 done