Merge ~anonymouse67/ubuntu-core-initramfs:bugfix/uc20-delete-errant-kernel-wants into ~canonical-foundations/ubuntu-core-initramfs:master

[Ian Johnson]

The usr-lib-{modules,firmware} mounts were incorrectly being done too early, as
when snap-bootstrap mounted the kernel snap before the base snap, the initrd
would then proceed to mount sysroot, and then mount
sysroot-usr-lib-{firmware,modules}.mount onto /run/mnt/base, which at that point
didn't actually have the base snap mounted yet, and thus when we did go to mount
/run/mnt/base, we would mount over the firmware and modules mounts did earlier.

Removing these mounts means that we don't end up performing the firmware and
modules mounts until after sysroot, which doesn't get run until after we mount
the base snap on /run/mnt/base.

This will fix the issue where recover and install modes did not have kernel
modules mounted right at switch root, and thus they did not get various kernel
modules loaded, which was the root cause of no networking during install/recover
modes.

[Ian Johnson (anonymouse67)]

Also this explains why it worked in run mode, but not in install mode and recover mode, in run mode, snap-bootstrap just so happens to request the base snap be mounted first, while in recover and install modes, snap-bootstrap requests the kernel snap be mounted first. We should probably also make changes to snap-bootstrap to mount the base snap first, but regardless I think these wants are not necessary at best, and wrong at worst.

[Dimitri John Ledkov (xnox)]

review: Approve

diff --git a/factory/usr/lib/systemd/system/run-mnt-kernel.mount.wants/sysroot-usr-lib-firmware.mount b/factory/usr/lib/systemd/system/run-mnt-kernel.mount.wants/sysroot-usr-lib-firmware.mount
deleted file mode 120000
index 1e939ab..0000000
--- a/factory/usr/lib/systemd/system/run-mnt-kernel.mount.wants/sysroot-usr-lib-firmware.mount
+++ /dev/null
@@ -1 +0,0 @@
-../sysroot-usr-lib-firmware.mount
\ No newline at end of file
diff --git a/factory/usr/lib/systemd/system/run-mnt-kernel.mount.wants/sysroot-usr-lib-modules.mount b/factory/usr/lib/systemd/system/run-mnt-kernel.mount.wants/sysroot-usr-lib-modules.mount
deleted file mode 120000
index 5dbf7f0..0000000
--- a/factory/usr/lib/systemd/system/run-mnt-kernel.mount.wants/sysroot-usr-lib-modules.mount
+++ /dev/null
@@ -1 +0,0 @@
-../sysroot-usr-lib-modules.mount
\ No newline at end of file