live-build/auto/build: Move NetworkManager configuration to the right

place.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.428) UNRELEASED; urgency=medium
+
+  * live-build/auto/build: Move NetworkManager configuration to the right
+    place.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 19 Aug 2016 16:27:46 +0200
+
 livecd-rootfs (2.427) yakkety; urgency=medium
 
   * live-build/auto/build: If the image pre-installs network-manager, let it

live-build/auto/build

@@ -193,6 +193,23 @@ serial: $BUILDSTAMP
 EOF
 	fi
 
+	# If the image pre-installs network-manager, let it manage all devices by
+	# 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
+		echo "===== Enabling all devices in NetworkManager ===="
+		mkdir -p chroot/etc/netplan
+		cat <<EOF > chroot/etc/netplan/01-network-manager-all.yaml
+# Let NetworkManager manage all devices on this system
+network:
+  version 2
+  renderer: NetworkManager
+EOF
+	else
+		echo "==== NetworkManager not installed ===="
+	fi
+
 	echo "===== Checking size of /usr/share/doc ====="
 	echo BEGIN docdirs
 	(cd chroot && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr)
@@ -716,17 +733,3 @@ case $PROJECT in
 		fi
 		;;
 esac
-
-# If the image pre-installs network-manager, let it manage all devices by
-# 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
-    mkdir -p chroot/etc/netplan
-    cat <<EOF > chroot/etc/netplan/01-network-manager-all.yaml
-# Let NetworkManager manage all devices on this system
-network:
-  version 2
-  renderer: NetworkManager
-EOF
-fi