mirror of
https://git.proxmox.com/git/mirror_lxc
synced 2025-08-07 16:59:08 +00:00
ubuntu templates: remove maverick as it is end-of-life
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
parent
b8bced69a8
commit
f34ff29683
@ -139,7 +139,7 @@ release=lucid
|
|||||||
if [ -f /etc/lsb-release ]; then
|
if [ -f /etc/lsb-release ]; then
|
||||||
. /etc/lsb-release
|
. /etc/lsb-release
|
||||||
case "$DISTRIB_CODENAME" in
|
case "$DISTRIB_CODENAME" in
|
||||||
lucid|maverick|natty|oneiric|precise|quantal)
|
lucid|natty|oneiric|precise|quantal)
|
||||||
release=$DISTRIB_CODENAME
|
release=$DISTRIB_CODENAME
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -152,8 +152,6 @@ download_ubuntu()
|
|||||||
|
|
||||||
if [ $release = "lucid" ]; then
|
if [ $release = "lucid" ]; then
|
||||||
packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,dhcp3-client,ssh,lsb-release,gnupg
|
packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,dhcp3-client,ssh,lsb-release,gnupg
|
||||||
elif [ $release = "maverick" ]; then
|
|
||||||
packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,dhcp3-client,ssh,lsb-release,gnupg,netbase
|
|
||||||
elif [ $release = "natty" ]; then
|
elif [ $release = "natty" ]; then
|
||||||
packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,isc-dhcp-client,isc-dhcp-common,ssh,lsb-release,gnupg,netbase
|
packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,isc-dhcp-client,isc-dhcp-common,ssh,lsb-release,gnupg,netbase
|
||||||
else
|
else
|
||||||
@ -479,11 +477,11 @@ post_process()
|
|||||||
|
|
||||||
if [ $trim_container -eq 1 ]; then
|
if [ $trim_container -eq 1 ]; then
|
||||||
trim $rootfs $release
|
trim $rootfs $release
|
||||||
elif [ $release = "lucid" -o $release = "maverick" -o $release = "natty" \
|
elif [ $release = "lucid" -o $release = "natty" \
|
||||||
-o $release = "oneiric" ]; then
|
-o $release = "oneiric" ]; then
|
||||||
# for lucid and maverick, if not trimming, then add the ubuntu-virt
|
# for lucid, if not trimming, then add the ubuntu-virt
|
||||||
# ppa and install lxcguest
|
# ppa and install lxcguest
|
||||||
if [ $release = "lucid" -o $release = "maverick" ]; then
|
if [ $release = "lucid" ]; then
|
||||||
chroot $rootfs apt-get install --force-yes -y python-software-properties
|
chroot $rootfs apt-get install --force-yes -y python-software-properties
|
||||||
chroot $rootfs add-apt-repository ppa:ubuntu-virt/ppa
|
chroot $rootfs add-apt-repository ppa:ubuntu-virt/ppa
|
||||||
fi
|
fi
|
||||||
@ -571,7 +569,7 @@ usage()
|
|||||||
cat <<EOF
|
cat <<EOF
|
||||||
$1 -h|--help [-a|--arch] [-b|--bindhome <user>] [--trim] [-d|--debug]
|
$1 -h|--help [-a|--arch] [-b|--bindhome <user>] [--trim] [-d|--debug]
|
||||||
[-F | --flush-cache] [-r|--release <release>] [ -S | --auth-key <keyfile>]
|
[-F | --flush-cache] [-r|--release <release>] [ -S | --auth-key <keyfile>]
|
||||||
release: lucid | maverick | natty | oneiric | precise | quantal
|
release: lucid | natty | oneiric | precise | quantal
|
||||||
trim: make a minimal (faster, but not upgrade-safe) container
|
trim: make a minimal (faster, but not upgrade-safe) container
|
||||||
bindhome: bind <user>'s home into the container
|
bindhome: bind <user>'s home into the container
|
||||||
The ubuntu user will not be created, and <user> will have
|
The ubuntu user will not be created, and <user> will have
|
||||||
@ -593,7 +591,7 @@ release=lucid
|
|||||||
if [ -f /etc/lsb-release ]; then
|
if [ -f /etc/lsb-release ]; then
|
||||||
. /etc/lsb-release
|
. /etc/lsb-release
|
||||||
case "$DISTRIB_CODENAME" in
|
case "$DISTRIB_CODENAME" in
|
||||||
lucid|maverick|natty|oneiric|precise|quantal)
|
lucid|natty|oneiric|precise|quantal)
|
||||||
release=$DISTRIB_CODENAME
|
release=$DISTRIB_CODENAME
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
Loading…
Reference in New Issue
Block a user