From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Thu, 31 Aug 2017 11:40:58 +0000 (+0100)
Subject: Check that there is netplan binary, rather than just just a config directory.
X-Git-Tag: lxc-2.1.0~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db3c8336ac89a0c7a1ea29c613c58dd91220e4e3;p=thirdparty%2Flxc.git

Check that there is netplan binary, rather than just just a config directory.

Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index ec41fcd2a..80a28fd2a 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -92,7 +92,7 @@ configure_ubuntu()
     password=$5
 
     # configure the network using the dhcp
-    if [ -d $rootfs/etc/netplan ]; then
+    if chroot $rootfs which netplan >/dev/null 2>&1; then
         cat <<EOF > $rootfs/etc/netplan/10-lxc.yaml
 network:
   ethernets: