From 6a804b7b2cb5ea6113cf92e185b7c9a55fc23d96 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 28 Mar 2023 14:51:13 +0100 Subject: [PATCH] Don't add 01-network-manager-all.yaml to preinstalled desktop images --- live-build/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/functions b/live-build/functions index 1e81de9b..a3cbadfd 100644 --- a/live-build/functions +++ b/live-build/functions @@ -999,7 +999,7 @@ configure_network_manager() { # 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 [ -e chroot/usr/sbin/NetworkManager -a ! -f chroot/etc/netplan/01-network-manager-all.yaml ]; then + if [ -e chroot/usr/sbin/NetworkManager -a ! -f chroot/etc/netplan/01-network-manager-all.yaml -a "$SUBPROJECT" != "desktop-preinstalled" ]; then echo "===== Enabling all devices in NetworkManager ====" mkdir -p chroot/etc/netplan cat < chroot/etc/netplan/01-network-manager-all.yaml