[lxc-devel] [PATCH] ubuntu: Drop lucid support and refresh releaess list

[Serge Hallyn]

Quoting Stéphane Graber (stgraber at ubuntu.com):
> Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>

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

> ---
>  templates/lxc-ubuntu-cloud.in |  2 +-
>  templates/lxc-ubuntu.in       | 22 ----------------------
>  2 files changed, 1 insertion(+), 23 deletions(-)
> 
> diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
> index 81abf2a..92dc691 100644
> --- a/templates/lxc-ubuntu-cloud.in
> +++ b/templates/lxc-ubuntu-cloud.in
> @@ -25,7 +25,7 @@ STATE_DIR="@LOCALSTATEDIR@"
>  HOOK_DIR="@LXCHOOKDIR@"
>  CLONE_HOOK_FN="$HOOK_DIR/ubuntu-cloud-prep"
>  LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
> -KNOWN_RELEASES="lucid precise quantal saucy trusty"
> +KNOWN_RELEASES="precise trusty utopic vivid"
>  skip_arch_check=${UCTEMPLATE_SKIP_ARCH_CHECK:-0}
>  
>  # Make sure the usual locations are in PATH
> diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
> index 073724b..55199dc 100644
> --- a/templates/lxc-ubuntu.in
> +++ b/templates/lxc-ubuntu.in
> @@ -536,28 +536,6 @@ exit 101
>  EOF
>      chmod +x $rootfs/usr/sbin/policy-rc.d
>  
> -    if [ ! -f $rootfs/etc/init/container-detect.conf ]; then
> -        # Make sure we have a working resolv.conf
> -        cresolvonf="${rootfs}/etc/resolv.conf"
> -        mv $cresolvonf ${cresolvonf}.lxcbak
> -        cat /etc/resolv.conf > ${cresolvonf}
> -
> -        # for lucid, if not trimming, then add the ubuntu-virt
> -        # ppa and install lxcguest
> -        if [ $release = "lucid" ]; then
> -            chroot $rootfs apt-get update
> -            install_packages $rootfs "python-software-properties"
> -            chroot $rootfs add-apt-repository ppa:ubuntu-virt/ppa
> -        fi
> -
> -        chroot $rootfs apt-get update
> -        chroot $rootfs apt-get install --force-yes -y lxcguest
> -
> -        # Restore old resolv.conf
> -        rm -f ${cresolvonf}
> -        mv ${cresolvonf}.lxcbak ${cresolvonf}
> -    fi
> -
>      # If the container isn't running a native architecture, setup multiarch
>      if [ -x "$(ls -1 ${rootfs}/usr/bin/qemu-*-static 2>/dev/null)" ]; then
>          dpkg_version=$(chroot $rootfs dpkg-query -W -f='${Version}' dpkg)
> -- 
> 1.9.1
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel