- Also include the variant in the path - Fix invalid LXC_CACHE_BASE - Drop redundant code
Signed-off-by: Stéphane Graber <[email protected]> --- templates/lxc-download.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/lxc-download.in b/templates/lxc-download.in index 3b1d9f9..3ef9fba 100644 --- a/templates/lxc-download.in +++ b/templates/lxc-download.in @@ -327,15 +327,15 @@ fi # Setup the cache if [ "$DOWNLOAD_MODE" = "system" ]; then - LXC_CACHE_BASE="$LOCALSTATEDIR/cache/" - LXC_CACHE_PATH="$LOCALSTATEDIR/cache/lxc/download/$DOWNLOAD_DIST" - LXC_CACHE_PATH="$LXC_CACHE_PATH/$DOWNLOAD_RELEASE/$DOWNLOAD_ARCH" + LXC_CACHE_BASE="$LOCALSTATEDIR/cache/lxc/" else LXC_CACHE_BASE="$HOME/.cache/lxc/" - LXC_CACHE_PATH="$HOME/.cache/lxc/download/$DOWNLOAD_DIST" - LXC_CACHE_PATH="$LXC_CACHE_PATH/$DOWNLOAD_RELEASE/$DOWNLOAD_ARCH" fi +LXC_CACHE_PATH="$LXC_CACHE_BASE/download/$DOWNLOAD_DIST" +LXC_CACHE_PATH="$LXC_CACHE_PATH/$DOWNLOAD_RELEASE/$DOWNLOAD_ARCH/" +LXC_CACHE_PATH="$LXC_CACHE_PATH/$DOWNLOAD_VARIANT" + if [ -d "$LXC_CACHE_PATH" ]; then if [ "$DOWNLOAD_FLUSH_CACHE" = "true" ]; then echo "Flushing the cache..." -- 1.8.5.3 _______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
