mirror of
git://github.com/lxc/lxc
synced 2025-09-01 22:39:36 +00:00
lxc-download: Tweak cache location
- Also include the variant in the path - Fix invalid LXC_CACHE_BASE - Drop redundant code Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
@@ -327,15 +327,15 @@ fi
|
|||||||
|
|
||||||
# Setup the cache
|
# Setup the cache
|
||||||
if [ "$DOWNLOAD_MODE" = "system" ]; then
|
if [ "$DOWNLOAD_MODE" = "system" ]; then
|
||||||
LXC_CACHE_BASE="$LOCALSTATEDIR/cache/"
|
LXC_CACHE_BASE="$LOCALSTATEDIR/cache/lxc/"
|
||||||
LXC_CACHE_PATH="$LOCALSTATEDIR/cache/lxc/download/$DOWNLOAD_DIST"
|
|
||||||
LXC_CACHE_PATH="$LXC_CACHE_PATH/$DOWNLOAD_RELEASE/$DOWNLOAD_ARCH"
|
|
||||||
else
|
else
|
||||||
LXC_CACHE_BASE="$HOME/.cache/lxc/"
|
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
|
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 [ -d "$LXC_CACHE_PATH" ]; then
|
||||||
if [ "$DOWNLOAD_FLUSH_CACHE" = "true" ]; then
|
if [ "$DOWNLOAD_FLUSH_CACHE" = "true" ]; then
|
||||||
echo "Flushing the cache..."
|
echo "Flushing the cache..."
|
||||||
|
Reference in New Issue
Block a user