[lxc-devel] [PATCH 2/3] lxc-debian: add --flush-cache

[Serge E. Hallyn]

Quoting Laurent Vivier (laurent at vivier.eu):
> copied from lxc-ubuntu.in
> 
> Signed-off-by: Laurent Vivier <laurent at vivier.eu>

Acked-by: Serge Hallyn <serge at hallyn.com>

> ---
>  templates/lxc-debian.in | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
> index 5dc4e0b..6c4eb81 100644
> --- a/templates/lxc-debian.in
> +++ b/templates/lxc-debian.in
> @@ -375,6 +375,7 @@ install_debian()
>      cache="$4/debian"
>      interpreter="$5"
>      interpreter_path="$6"
> +    flushcache=$7
>      mkdir -p $LOCALSTATEDIR/lock/subsys/
>      (
>          flock -x 9
> @@ -383,6 +384,11 @@ install_debian()
>              return 1
>          fi
>  
> +        if [ $flushcache -eq 1 ]; then
> +            echo "Flushing cache..."
> +            cleanup
> +        fi
> +
>          echo "Checking cache download in $cache/rootfs-$release-$arch ... "
>          if [ ! -e "$cache/rootfs-$release-$arch" ]; then
>              download_debian $cache $arch $release "$interpreter" "$interpreter_path"
> @@ -547,6 +553,7 @@ Usage: $1 -h|--help -p|--path=<path> [-c|--clean] [-a|--arch=<arch>] [-r|--relea
>                                       [--mirror=<mirror>] [--security-mirror=<security mirror>]
>                                       [--package=<package_name1,package_name2,...>]
>                                       [-I|--interpreter-path=<interpreter path>]
> +                                     [-F | --flush-cache]
>  
>  Options :
>  
> @@ -567,6 +574,7 @@ Options :
>    --enable-non-free      include also Debian's contrib and non-free repositories.
>    -I|--interpreter-path=INTERPRETER-PATH
>                           Path of the binfmt interpreter to copy to the rootfs
> +  -F | --flush-cache     Flush the debian release cache
>  
>  Environment variables:
>  
> @@ -579,7 +587,7 @@ EOF
>      return 0
>  }
>  
> -options=$(getopt -o hp:n:a:r:cI: -l arch:,clean,help,enable-non-free,mirror:,name:,packages:,path:,release:,rootfs:,security-mirror:,interpreter-path: -- "$@")
> +options=$(getopt -o hp:n:a:r:cI:F -l arch:,clean,help,enable-non-free,mirror:,name:,packages:,path:,release:,rootfs:,security-mirror:,interpreter-path:,flush-cache -- "$@")
>  if [ $? -ne 0 ]; then
>          usage $(basename $0)
>          exit 1
> @@ -596,6 +604,7 @@ elif [ "$arch" = "armv7l" ]; then
>  fi
>  hostarch=$arch
>  mainonly=1
> +flushcache=0
>  
>  while true
>  do
> @@ -615,6 +624,7 @@ do
>          -r|--release)         release=$2; shift 2;;
>             --rootfs)          rootfs=$2; shift 2;;
>             --security-mirror) SECURITY_MIRROR=$2; shift 2;;
> +        -F|--flush-cache)     flushcache=1; shift 1;;
>          *)                    break ;;
>      esac
>  done
> @@ -701,7 +711,7 @@ else
>      num_tty=4
>  fi
>  
> -install_debian $rootfs $release $arch $LXC_CACHE_PATH "$interpreter" "$interpreter_path"
> +install_debian $rootfs $release $arch $LXC_CACHE_PATH "$interpreter" "$interpreter_path" $flushcache
>  if [ $? -ne 0 ]; then
>      echo "failed to install debian"
>      exit 1
> -- 
> 2.5.5
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel