add support for Debian 9 (stretch)
This commit is contained in:
parent
a258028c65
commit
bbbf031932
6 changed files with 10 additions and 4 deletions
2
Makefile
2
Makefile
|
@ -1,5 +1,5 @@
|
||||||
UBUNTU_BOXES= precise quantal raring saucy trusty utopic vivid wily xenial
|
UBUNTU_BOXES= precise quantal raring saucy trusty utopic vivid wily xenial
|
||||||
DEBIAN_BOXES= squeeze wheezy sid jessie
|
DEBIAN_BOXES= squeeze wheezy jessie stretch sid
|
||||||
CENTOS_BOXES= 6
|
CENTOS_BOXES= 6
|
||||||
FEDORA_BOXES= rawhide 23 22 21 20 19
|
FEDORA_BOXES= rawhide 23 22 21 20 19
|
||||||
TODAY=$(shell date -u +"%Y-%m-%d")
|
TODAY=$(shell date -u +"%Y-%m-%d")
|
||||||
|
|
|
@ -19,6 +19,7 @@ This repository contains a set of scripts for creating base boxes for usage with
|
||||||
- Squeeze x86_64
|
- Squeeze x86_64
|
||||||
- Wheezy x86_64
|
- Wheezy x86_64
|
||||||
- Jessie x86_64
|
- Jessie x86_64
|
||||||
|
- Stretch x86_64
|
||||||
- Sid x86_64
|
- Sid x86_64
|
||||||
* Fedora
|
* Fedora
|
||||||
- 19 x86_64
|
- 19 x86_64
|
||||||
|
|
|
@ -52,7 +52,8 @@ else
|
||||||
fi
|
fi
|
||||||
if [ ${DISTRIBUTION} = 'fedora' ] ||\
|
if [ ${DISTRIBUTION} = 'fedora' ] ||\
|
||||||
[ ${DISTRIBUTION} = 'ubuntu' -a ${RELEASE} = 'wily' ] ||\
|
[ ${DISTRIBUTION} = 'ubuntu' -a ${RELEASE} = 'wily' ] ||\
|
||||||
[ ${DISTRIBUTION} = 'debian' -a ${RELEASE} = 'jessie' ]
|
[ ${DISTRIBUTION} = 'debian' -a ${RELEASE} = 'jessie' ] ||\
|
||||||
|
[ ${DISTRIBUTION} = 'debian' -a ${RELEASE} = 'stretch' ]
|
||||||
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
|
||||||
|
|
1
conf/debian-stretch
Symbolic link
1
conf/debian-stretch
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
debian-jessie
|
5
debian/install-extras.sh
vendored
5
debian/install-extras.sh
vendored
|
@ -14,7 +14,7 @@ SECS=15
|
||||||
log "Sleeping for $SECS seconds..."
|
log "Sleeping for $SECS seconds..."
|
||||||
sleep $SECS
|
sleep $SECS
|
||||||
|
|
||||||
PACKAGES=(vim curl wget man-db openssh-server bash-completion python-software-properties ca-certificates sudo)
|
PACKAGES=(vim curl wget man-db openssh-server bash-completion ca-certificates sudo)
|
||||||
|
|
||||||
log "Installing additional packages: ${ADDPACKAGES}"
|
log "Installing additional packages: ${ADDPACKAGES}"
|
||||||
PACKAGES+=" ${ADDPACKAGES}"
|
PACKAGES+=" ${ADDPACKAGES}"
|
||||||
|
@ -25,6 +25,9 @@ fi
|
||||||
if [ $RELEASE != 'raring' ] && [ $RELEASE != 'saucy' ] && [ $RELEASE != 'trusty' ] && [ $RELEASE != 'wily' ] ; then
|
if [ $RELEASE != 'raring' ] && [ $RELEASE != 'saucy' ] && [ $RELEASE != 'trusty' ] && [ $RELEASE != 'wily' ] ; then
|
||||||
PACKAGES+=' nfs-common'
|
PACKAGES+=' nfs-common'
|
||||||
fi
|
fi
|
||||||
|
if [ $RELEASE != 'stretch' ] ; then
|
||||||
|
PACKAGES+=' python-software-properties'
|
||||||
|
fi
|
||||||
utils.lxc.attach apt-get update
|
utils.lxc.attach apt-get update
|
||||||
utils.lxc.attach apt-get install ${PACKAGES[*]} -y --force-yes
|
utils.lxc.attach apt-get install ${PACKAGES[*]} -y --force-yes
|
||||||
utils.lxc.attach apt-get upgrade -y --force-yes
|
utils.lxc.attach apt-get upgrade -y --force-yes
|
||||||
|
|
2
debian/vagrant-lxc-fixes.sh
vendored
2
debian/vagrant-lxc-fixes.sh
vendored
|
@ -30,7 +30,7 @@ if [ ${DISTRIBUTION} = 'debian' ]; then
|
||||||
|
|
||||||
# Fixes for jessie, following the guide from
|
# Fixes for jessie, following the guide from
|
||||||
# https://wiki.debian.org/LXC#Incompatibility_with_systemd
|
# https://wiki.debian.org/LXC#Incompatibility_with_systemd
|
||||||
if [ "$RELEASE" = 'jessie' ]; then
|
if [ "$RELEASE" = 'jessie' ] || [ "$RELEASE" = 'stretch' ]; then
|
||||||
# Reconfigure the LXC
|
# Reconfigure the LXC
|
||||||
utils.lxc.attach /bin/cp \
|
utils.lxc.attach /bin/cp \
|
||||||
/lib/systemd/system/getty@.service \
|
/lib/systemd/system/getty@.service \
|
||||||
|
|
Loading…
Reference in a new issue