Merge ~maciek-borzecki/ubuntu-core-initramfs:bboozzoo/choser-integration into ~canonical-foundations/ubuntu-core-initramfs:master

[Maciej Borzecki]

Changes for running recovery chooser trigger service early during the boot process.

[Maciej Borzecki (maciek-borzecki)]

The build will fail until a new version of snapd containing snapd.recovery-chooser-trigger.service is released and uploaded into the archive. An alternative would be to carry the service inside ubuntu-core-initramfs skeleton.

diff --git a/debian/rules b/debian/rules
index 442da9c..ca847cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -183,7 +183,7 @@ override_dh_auto_install:
 	done
 
 	set -e; \
-	for f in "/lib/$(DEB_HOST_MULTIARCH)/libnss_files.so.* /lib/$(DEB_HOST_MULTIARCH)/libnss_compat.so.* /lib/$(DEB_HOST_MULTIARCH)/libgcc_s.so.1 /sbin/e2fsck /sbin/fsck.vfat /sbin/fsck /bin/umount /bin/mount /bin/kmod /usr/bin/unsquashfs /usr/lib/snapd/snap-bootstrap /sbin/dmsetup"; do \
+	for f in "/lib/$(DEB_HOST_MULTIARCH)/libnss_files.so.* /lib/$(DEB_HOST_MULTIARCH)/libnss_compat.so.* /lib/$(DEB_HOST_MULTIARCH)/libgcc_s.so.1 /sbin/e2fsck /sbin/fsck.vfat /sbin/fsck /bin/umount /bin/mount /bin/kmod /usr/bin/unsquashfs /sbin/dmsetup /usr/lib/snapd/snap-bootstrap /lib/systemd/system/snapd.recovery-chooser-trigger.service"; do \
 		/usr/lib/dracut/dracut-install -D $(CURDIR)/debian/tmp --ldd $$f; \
 	done
 	dpkg -L dmsetup | grep rules.d | xargs -L1 /usr/lib/dracut/dracut-install -D $(CURDIR)/debian/tmp --ldd
diff --git a/factory/usr/lib/systemd/system/basic.target.wants/snapd.recovery-chooser-trigger.service b/factory/usr/lib/systemd/system/basic.target.wants/snapd.recovery-chooser-trigger.service
 new file mode 120000
index 0000000..b417254
--- /dev/null
+++ b/factory/usr/lib/systemd/system/basic.target.wants/snapd.recovery-chooser-trigger.service
@@ -0,0 +1 @@
+../snapd.recovery-chooser-trigger.service
 \ No newline at end of file