Re: [lxc-devel] [PATCH 4/4] Fix grammar in some of the executables "NAME for name of the container" becomes "NAME of the container"

[Christian Brauner]

Updated PR on Github. Retains old behaviour of lxc executables.
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Re: [lxc-devel] [PATCH] lxc-debian: allow not including contrin/non-free

[Serge Hallyn]

Quoting Antonio Terceiro (terce...@debian.org):
> Signed-off-by: Antonio Terceiro 

Acked-by: Serge E. Hallyn 

> ---
>  templates/lxc-debian.in | 14 +++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
> index 3914605..493c858 100644
> --- a/templates/lxc-debian.in
> +++ b/templates/lxc-debian.in
> @@ -159,13 +159,19 @@ write_sourceslist()
>  prefix="deb [arch=${arch}]"
>  fi
>  
> +if [ "$mainonly" = 1 ]; then
> +  non_main=''
> +else
> +  non_main=' contrib non-free'
> +fi
> +
>  cat >> "${rootfs}/etc/apt/sources.list" << EOF
> -${prefix} $MIRROR  ${release} main contrib non-free
> +${prefix} $MIRROR  ${release} main${non_main}
>  EOF
>  
>  if [ "$release" != "unstable" -a "$release" != "sid" ]; then
>cat >> "${rootfs}/etc/apt/sources.list" << EOF
> -${prefix} $SECURITY_MIRROR ${release}/updates main contrib non-free
> +${prefix} $SECURITY_MIRROR ${release}/updates main${non_main}
>  EOF
>  fi
>  }
> @@ -471,6 +477,7 @@ Options :
>--packages=PACKAGE_NAME1,PACKAGE_NAME2,...
>   List of additional packages to install. Comma 
> separated, without space.
>-c, --cleanonly clean up the cache and terminate
> +  --main-onlyinclude only Debian's main repository (i.e. no 
> contrib and non-free).
>  
>  Environment variables:
>  
> @@ -483,7 +490,7 @@ EOF
>  return 0
>  }
>  
> -options=$(getopt -o hp:n:a:r:c -l 
> arch:,clean,help,mirror:,name:,packages:,path:,release:,rootfs:,security-mirror:
>  -- "$@")
> +options=$(getopt -o hp:n:a:r:c -l 
> arch:,clean,help,main-only,mirror:,name:,packages:,path:,release:,rootfs:,security-mirror:
>  -- "$@")
>  if [ $? -ne 0 ]; then
>  usage $(basename $0)
>  exit 1
> @@ -512,6 +519,7 @@ do
>  
>  -a|--arch)arch=$2; shift 2;;
>  -c|--clean)   clean=1; shift 1;;
> +   --main-only)   mainonly=1; shift 1;;
> --mirror)  MIRROR=$2; shift 2;;
>  -n|--name)name=$2; shift 2;;
> --packages)packages=$2; shift 2;;
> -- 
> 2.5.0
> 
> ___
> lxc-devel mailing list
> lxc-devel@lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Re: [lxc-devel] [PATCH] lxc-debian: support stretch (Debian 9) images

[Serge Hallyn]

Quoting Antonio Terceiro (terce...@debian.org):
> Signed-off-by: Antonio Terceiro 

Acked-by: Serge E. Hallyn 

> ---
>  templates/lxc-debian.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
> index 3914605..a6a1778 100644
> --- a/templates/lxc-debian.in
> +++ b/templates/lxc-debian.in
> @@ -570,7 +570,7 @@ fi
>  
>  current_release=`wget ${MIRROR}/dists/stable/Release -O - 2> /dev/null | 
> head |awk '/^Codename: (.*)$/ { print $2; }'`
>  release=${release:-${current_release}}
> -valid_releases=('squeeze' 'wheezy' 'jessie' 'sid')
> +valid_releases=('squeeze' 'wheezy' 'jessie' 'stretch' 'sid')
>  if [[ ! "${valid_releases[*]}" =~ (^|[^[:alpha:]])$release([^[:alpha:]]|$) 
> ]]; then
>  echo "Invalid release ${release}, valid ones are: ${valid_releases[*]}"
>  exit 1
> -- 
> 2.5.0
> 
> ___
> lxc-devel mailing list
> lxc-devel@lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel