From a02ea680da28f8fe6c4f3bf93e461d7a8dcbffe6 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 30 Aug 2017 13:45:27 +0100 Subject: [PATCH] templates/ubuntu: support netplan in newer releases by default MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If netplan is present in the container, configure default networking with neplan instead of ifupdown. Also, do not install ifupdown when boostrapping minbase variant, unless using currently support non-netplan releases (trusty, zenial, zesty). Signed-off-by: Dimitri John Ledkov Acked-by: Christian Brauner Acked-by: Stéphane Graber --- templates/lxc-ubuntu.in | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in index 226427d9e..dff6836b4 100644 --- a/templates/lxc-ubuntu.in +++ b/templates/lxc-ubuntu.in @@ -92,7 +92,15 @@ configure_ubuntu() password=$5 # configure the network using the dhcp - cat < $rootfs/etc/network/interfaces + if [ -d $rootfs/etc/netplan ]; then + cat < $rootfs/etc/netplan/10-lxc.yaml +network: + ethernets: + eth0: {dhcp4: true} + version: 2 +EOF + else + cat < $rootfs/etc/network/interfaces # This file describes the network interfaces available on your system # and how to activate them. For more information, see interfaces(5). @@ -103,6 +111,7 @@ iface lo inet loopback auto eth0 iface eth0 inet dhcp EOF + fi # set the hostname cat < $rootfs/etc/hostname @@ -366,7 +375,13 @@ download_ubuntu() debootstrap_parameters="$debootstrap_parameters --variant=$variant" fi if [ "$variant" = 'minbase' ]; then - packages_template="${packages_template},sudo,ifupdown,isc-dhcp-client" + packages_template="${packages_template},sudo" + # Newer releases use netplan, EOL releases not supported + case $release in + trusty|xenial|zesty) + packages_template="${packages_template},ifupdown,isc-dhcp-client" + ;; + esac fi echo "Installing packages in template: ${packages_template}" -- 2.47.2