mirror of
git://github.com/lxc/lxc
synced 2025-08-30 01:12:02 +00:00
Merge pull request #1288 from Cypresslin/known-release-zesty
Update Ubuntu release name: add zesty
This commit is contained in:
commit
7a8082f47b
@ -42,7 +42,7 @@ run_cmd() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
DONE=0
|
DONE=0
|
||||||
KNOWN_RELEASES="precise trusty wily xenial yakkety"
|
KNOWN_RELEASES="precise trusty xenial yakkety zesty"
|
||||||
MOUNTSR=/sys/kernel/security/apparmor/features/mount
|
MOUNTSR=/sys/kernel/security/apparmor/features/mount
|
||||||
dnam=`mktemp -d`
|
dnam=`mktemp -d`
|
||||||
cname=`basename $dnam`
|
cname=`basename $dnam`
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
|
||||||
DONE=0
|
DONE=0
|
||||||
KNOWN_RELEASES="precise trusty wily xenial yakkety"
|
KNOWN_RELEASES="precise trusty xenial yakkety zesty"
|
||||||
cleanup() {
|
cleanup() {
|
||||||
lxc-destroy -n $CONTAINER_NAME >/dev/null 2>&1 || true
|
lxc-destroy -n $CONTAINER_NAME >/dev/null 2>&1 || true
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ fi
|
|||||||
which newuidmap >/dev/null 2>&1 || { echo "'newuidmap' command is missing" >&2; exit 1; }
|
which newuidmap >/dev/null 2>&1 || { echo "'newuidmap' command is missing" >&2; exit 1; }
|
||||||
|
|
||||||
DONE=0
|
DONE=0
|
||||||
KNOWN_RELEASES="precise trusty wily xenial yakkety"
|
KNOWN_RELEASES="precise trusty xenial yakkety zesty"
|
||||||
cleanup() {
|
cleanup() {
|
||||||
cd /
|
cd /
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
# This test assumes an Ubuntu host
|
# This test assumes an Ubuntu host
|
||||||
|
|
||||||
DONE=0
|
DONE=0
|
||||||
KNOWN_RELEASES="precise trusty wily xenial yakkety"
|
KNOWN_RELEASES="precise trusty xenial yakkety zesty"
|
||||||
LXC_USER_NIC="@LIBEXECDIR@/lxc/lxc-user-nic"
|
LXC_USER_NIC="@LIBEXECDIR@/lxc/lxc-user-nic"
|
||||||
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
|
@ -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 wily xenial yakkety"
|
KNOWN_RELEASES="precise trusty xenial yakkety zesty"
|
||||||
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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user