From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 22 Sep 2009 15:08:13 +0000 (+0000)
Subject: merge r17674
X-Git-Tag: 8.09.2~37
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f50f3193c2b63aa5cfc68d4823fa7bc3f8c8d096;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r17674

SVN-Revision: 17675
---

diff --git a/scripts/combined-image.sh b/scripts/combined-image.sh
index eecd3d7f20..30373e7566 100644
--- a/scripts/combined-image.sh
+++ b/scripts/combined-image.sh
@@ -8,8 +8,8 @@ BLKSZ=65536
 }
 
 # Make sure provided images are 64k aligned.
-kern=$(tempfile)
-root=$(tempfile)
+kern=$(mktemp)
+root=$(mktemp)
 dd if="$1" of="$kern" bs=$BLKSZ conv=sync 2>/dev/null
 dd if="$2" of="$root" bs=$BLKSZ conv=sync 2>/dev/null