[lxc-devel] [PATCH 1/1] lxc-ubuntu.in: drop duplicate code

[Stéphane Graber]

On 05/24/2012 03:22 PM, Serge Hallyn wrote:
> Commits 15da01b3938d7ba45472e6c9d3b183a94dd86ca9 and
> 2e44ed1e647d9fd1544b7ad855bda22ca71abd12 conflicted and resulted in
> some duplicate functionality.  Drop the poorer version of that block.
> 
> Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>

Looks good.

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

> ---
>  templates/lxc-ubuntu.in |   28 ----------------------------
>  1 file changed, 28 deletions(-)
> 
> diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
> index 3e84e74..822554f 100644
> --- a/templates/lxc-ubuntu.in
> +++ b/templates/lxc-ubuntu.in
> @@ -160,34 +160,6 @@ download_ubuntu()
>              return 1
>      fi
>  
> -    echo "Installing updates"
> -    if [ -z "$MIRROR" ]; then
> -        MIRROR="http://archive.ubuntu.com/ubuntu"
> -    fi
> -    cat >> "$1/partial-${arch}/etc/apt/sources.list" << EOF
> -deb $MIRROR ${release}-updates main universe
> -deb http://security.ubuntu.com/ubuntu ${release}-security main universe
> -EOF
> -    chroot "$1/partial-${arch}" apt-get update
> -    if [ $? -ne 0 ]; then
> -        echo "Failed to update the apt cache"
> -        return 1
> -    fi
> -    cat > "$1/partial-${arch}"/usr/sbin/policy-rc.d << EOF
> -#!/bin/sh
> -exit 101
> -EOF
> -    chmod +x "$1/partial-${arch}"/usr/sbin/policy-rc.d
> -
> -    chroot "$1/partial-${arch}" apt-get dist-upgrade -y
> -    ret=$?
> -
> -    rm -f "$1/partial-${arch}"/usr/sbin/policy-rc.d
> -    if [ $ret -ne 0 ]; then
> -        echo "Failed to upgrade the cache"
> -        return 1
> -    fi
> -
>      # Serge isn't sure whether we should avoid doing this when
>      # $release == `distro-info -d`
>      echo "Installing updates"


-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 900 bytes
Desc: OpenPGP digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20120524/b5a08453/attachment.pgp>