Merge pull request #5 from erickeller/wily

add Ubuntu wily release
This commit is contained in:
Michael Adam 2015-12-21 13:20:17 +01:00
commit b42a24e013
4 changed files with 16 additions and 6 deletions

View file

@ -1,4 +1,4 @@
UBUNTU_BOXES= precise quantal raring saucy trusty utopic vivid UBUNTU_BOXES= precise quantal raring saucy trusty utopic vivid wily
DEBIAN_BOXES= squeeze wheezy sid jessie DEBIAN_BOXES= squeeze wheezy sid jessie
CENTOS_BOXES= 6 CENTOS_BOXES= 6
FEDORA_BOXES= rawhide 23 22 21 20 19 FEDORA_BOXES= rawhide 23 22 21 20 19

View file

@ -26,7 +26,7 @@ fi
# If we got to this point, we need to create the container # If we got to this point, we need to create the container
log "Creating container..." log "Creating container..."
if [ $RELEASE = 'raring' ]; then if [ $RELEASE = 'raring' ] || [ $RELEASE = 'wily' ]; then
utils.lxc.create -t ubuntu -- \ utils.lxc.create -t ubuntu -- \
--release ${RELEASE} \ --release ${RELEASE} \
--arch ${ARCH} --arch ${ARCH}
@ -50,9 +50,9 @@ else
--release ${RELEASE} \ --release ${RELEASE} \
--arch ${ARCH} --arch ${ARCH}
fi fi
if [ ${DISTRIBUTION} = 'fedora' ] ||\
if [ ${DISTRIBUTION} = 'fedora' -o \ [ ${DISTRIBUTION} = 'ubuntu' -a ${RELEASE} = 'wily' ] ||\
${DISTRIBUTION} = 'debian' -a ${RELEASE} = 'jessie' ] [ ${DISTRIBUTION} = 'debian' -a ${RELEASE} = 'jessie' ]
then then
# Improve systemd support: # Improve systemd support:
# - The fedora template does it but the fedora images from the download # - The fedora template does it but the fedora images from the download

10
conf/ubuntu-wily Normal file
View file

@ -0,0 +1,10 @@
# Template used to create this container: /usr/share/lxc/templates/lxc-ubuntu
# Parameters passed to the template: --release wily --arch amd64
# For additional config options, please look at lxc.container.conf(5)
# Common configuration
lxc.include = /usr/share/lxc/config/ubuntu.common.conf
# settings for systemd with PID 1:
lxc.kmsg = 0
lxc.autodev = 1

View file

@ -19,7 +19,7 @@ PACKAGES=(vim curl wget man-db openssh-server bash-completion python-software-pr
if [ $DISTRIBUTION = 'ubuntu' ]; then if [ $DISTRIBUTION = 'ubuntu' ]; then
PACKAGES+=' software-properties-common' PACKAGES+=' software-properties-common'
fi fi
if [ $RELEASE != 'raring' ] && [ $RELEASE != 'saucy' ] && [ $RELEASE != 'trusty' ] ; then if [ $RELEASE != 'raring' ] && [ $RELEASE != 'saucy' ] && [ $RELEASE != 'trusty' ] && [ $RELEASE != 'wily' ] ; then
PACKAGES+=' nfs-common' PACKAGES+=' nfs-common'
fi fi
utils.lxc.attach apt-get update utils.lxc.attach apt-get update