Skip to content

Commit

Permalink
ubuntu: Drop lucid support and refresh releaess list
Browse files Browse the repository at this point in the history
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
  • Loading branch information
stgraber committed Jan 30, 2015
1 parent 2bb376c commit c2f490e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 23 deletions.
2 changes: 1 addition & 1 deletion templates/lxc-ubuntu-cloud.in
Expand Up @@ -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
Expand Down
22 changes: 0 additions & 22 deletions templates/lxc-ubuntu.in
Expand Up @@ -497,28 +497,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)
Expand Down

0 comments on commit c2f490e

Please sign in to comment.