mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +02:00
a24ce339fd
The recent uprev of lxc left some fuzz in a patches. devtool refresh cleans this up, and no runtime issues have been detected. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 7c1c597592694d1f3e652657b1cc642a8990f8a0 Mon Sep 17 00:00:00 2001
|
|
From: Mark Asselstine <mark.asselstine@windriver.com>
|
|
Date: Thu, 31 May 2018 16:21:45 -0400
|
|
Subject: [PATCH] templates: actually create DOWNLOAD_TEMP directory
|
|
|
|
The way 'mktemp' is currently used you will get a temp directory in
|
|
$TMPDIR or '/tmp' and DOWNLOAD_TEMP will not be pointing to an actual
|
|
directory. This will result in the wget operations failing and the
|
|
container will fail to create:
|
|
|
|
ERROR: Failed to download http://....
|
|
|
|
Instead we want to use the '-p' option for mktemp to set the base path
|
|
and this will ensure that the temp directory is created in the correct
|
|
location and DOWNLOAD_TEMP will be consistent with this location.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
|
|
|
---
|
|
templates/lxc-download.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/templates/lxc-download.in b/templates/lxc-download.in
|
|
index 58d063f..d7e6128 100644
|
|
--- a/templates/lxc-download.in
|
|
+++ b/templates/lxc-download.in
|
|
@@ -329,7 +329,7 @@ elif [ -n "${DOWNLOAD_TEMP}" ]; then
|
|
mkdir -p "${DOWNLOAD_TEMP}"
|
|
DOWNLOAD_TEMP="$(mktemp -p ${DOWNLOAD_TEMP} -d)"
|
|
else
|
|
- DOWNLOAD_TEMP="${DOWNLOAD_TEMP}$(mktemp -d)"
|
|
+ DOWNLOAD_TEMP="$(mktemp -p ${DOWNLOAD_TEMP} -d)"
|
|
fi
|
|
|
|
# Simply list images
|