From c0313eaf3634977b458dc65b166d4157ea20d418 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 7 Dec 2018 06:26:06 +0000 Subject: [PATCH] Imported 2.548 No reason for CPC update specified. --- debian/changelog | 8 ++++++++ live-build/auto/build | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a6b4f007..f593f7b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.548) disco; urgency=medium + + * Key netplan delegation to NetworkManager on presence of + /usr/sbin/NetworkManager, not on /usr/lib/NetworkManager which may have + hooks from other packages (i.e., wpasupplicant). + + -- Steve Langasek Thu, 06 Dec 2018 13:38:09 +0200 + livecd-rootfs (2.547) disco; urgency=medium [ Łukasz Zemczak ] diff --git a/live-build/auto/build b/live-build/auto/build index f27bbb7b..fb35aa30 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -451,7 +451,7 @@ EOF # default. Installing NM on an existing system only manages wifi and wwan via # /usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf. When setting # the global backend to NM, netplan overrides that file. - if [ -d chroot/usr/lib/NetworkManager ]; then + if [ -e chroot/usr/sbin/NetworkManager ]; then echo "===== Enabling all devices in NetworkManager ====" mkdir -p chroot/etc/netplan cat < chroot/etc/netplan/01-network-manager-all.yaml