Merge ~laney/ubiquity:oem-config-nm into ubiquity:master

[Iain Lane]

[Iain Lane (laney)]

You could probably do this in another way, by statically shipping the symlink or statically requiring NM. I felt like it was better to this dynamically if the 'underlying' system wants NM, but I don't feel very strongly about it.

Unmerged commits

90b18e2... by Iain Lane on 2020-10-12

oem-config-{prepare,firstboot}: Set up NetworkManager if it is already used

We change the default target from graphical.target to oem-config.target.
That means things from the old default transaction - including
multi-user.target's depends like NM - aren't automatically included any
more.

Most things we don't need, since this is a very minimal session, but NM
is useful when running oem-config for geoip and also potentially for
preseeding. Let's make sure it gets started.

diff --git a/bin/oem-config-firstboot b/bin/oem-config-firstboot
index bb8aba7..7ce1520 100755
--- a/bin/oem-config-firstboot
+++ b/bin/oem-config-firstboot
@@ -91,6 +91,7 @@ for try in $(seq 1 $TRY); do
 		/bin/systemctl disable oem-config.service || true
 		/bin/systemctl disable oem-config.target || true
 		rm -f /lib/systemd/system/oem-config.* || true
+		rm -f /etc/systemd/system/oem-config.target.wants/ || true
 		RET="$(echo GET oem-config/reboot | debconf-communicate)" || true
 		if [ "${RET#* }" = true ]; then
 			/usr/bin/grub-editenv - unset recordfail || true
diff --git a/bin/oem-config-prepare b/bin/oem-config-prepare
index fba5680..c866e67 100755
--- a/bin/oem-config-prepare
+++ b/bin/oem-config-prepare
@@ -33,6 +33,14 @@ if [ "$(id -u)" = 0 ]; then
 	/bin/systemctl enable oem-config.service
 	/bin/systemctl enable oem-config.target
 	/bin/systemctl set-default oem-config.target
+	# We just changed the default target from graphical.target, but we
+	# still want NM.
+	for unit in /etc/systemd/system/multi-user.target.wants/NetworkManager*; do
+		if [ -L "${unit}" ]; then
+			mkdir -p /etc/systemd/system/oem-config.target.wants/
+			cp -a "${unit}" /etc/systemd/system/oem-config.target.wants/
+		fi
+	done
 else
 	pkexec "$0" ${quiet:+--quiet} "$@"
 	exit 0