proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-12 09:50:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ubuntu-cloud: Various fixes

Browse Source 
- Update list of supported releases
 - Make the fallback release trusty
 - Don't specify the compression algorithm (use auto-detection) so that
   people passing tarballs to the template don't see regressions.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2015-11-12 12:44:38 -05:00
parent 2681c0e7ea
commit f8b2a49ce0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/lxc-ubuntu-cloud.in
View File

@ -25,7 +25,7 @@ STATE_DIR="@LOCALSTATEDIR@"
HOOK_DIR="@LXCHOOKDIR@" HOOK_DIR="@LXCHOOKDIR@"
CLONE_HOOK_FN="$HOOK_DIR/ubuntu-cloud-prep" CLONE_HOOK_FN="$HOOK_DIR/ubuntu-cloud-prep"
LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@" LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
KNOWN_RELEASES="precise trusty utopic vivid" KNOWN_RELEASES="precise trusty vivid wily xenial"
skip_arch_check=${UCTEMPLATE_SKIP_ARCH_CHECK:-0} skip_arch_check=${UCTEMPLATE_SKIP_ARCH_CHECK:-0}
# Make sure the usual locations are in PATH # Make sure the usual locations are in PATH
@ -155,8 +155,8 @@ eval set -- "$options"
mapped_uid=-1 mapped_uid=-1
mapped_gid=-1 mapped_gid=-1
# default release is precise, or the systems release if recognized # default release is trusty, or the systems release if recognized
release=precise release=trusty
if [ -f /etc/lsb-release ]; then if [ -f /etc/lsb-release ]; then
. /etc/lsb-release . /etc/lsb-release
rels=$(ubuntu-distro-info --supported 2>/dev/null) || rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
@ -179,7 +179,7 @@ else
arch="amd64" arch="amd64"
elif [ "$arch" = "armv7l" ]; then elif [ "$arch" = "armv7l" ]; then
# note: arm images don't exist before oneiric; are called armhf in # note: arm images don't exist before oneiric; are called armhf in
# precise and later; and are not supported by the query, so we don't actually # trusty and later; and are not supported by the query, so we don't actually
# support them yet (see check later on). When Query2 is available, # support them yet (see check later on). When Query2 is available,
# we'll use that to enable arm images. # we'll use that to enable arm images.
arch="armhf" arch="armhf"
@ -328,10 +328,10 @@ do_extract_rootfs() {
mkdir -p $rootfs mkdir -p $rootfs
cd $rootfs cd $rootfs
if [ $in_userns -eq 1 ]; then if [ $in_userns -eq 1 ]; then
tar --anchored --exclude="dev/*" --numeric-owner -xpJf "$cache/$filename" tar --anchored --exclude="dev/*" --numeric-owner -xpf "$cache/$filename"
mkdir -p $rootfs/dev/pts/ mkdir -p $rootfs/dev/pts/
else else
tar --numeric-owner -xpJf "$cache/$filename" tar --numeric-owner -xpf "$cache/$filename"
fi fi
} }