Merge ~mvo/ubuntu-core-initramfs:the-modeenv into ~canonical-foundations/ubuntu-core-initramfs:master

[Michael Vogt]

diff --git a/factory/usr/lib/the-modeenv b/factory/usr/lib/the-modeenv
index 1619eac..a9a1532 100755
--- a/factory/usr/lib/the-modeenv
+++ b/factory/usr/lib/the-modeenv
@@ -1,6 +1,6 @@
 #!/bin/sh
 o=/sysroot/writable/system-data/var/lib/snapd/modeenv
 sed 's/.*snapd_recovery_mode=\([a-z]*\).*/mode=\1/' /proc/cmdline >> $o
-sed 's/.*snapd_recovery_system=\([0-9]*\).*/recovery_system=\1/' /proc/cmdline >> $o
+sed 's/.*snapd_recovery=\([0-9]*\).*/recovery_system=\1/' /proc/cmdline >> $o
 mount -o bind /run/mnt/ubuntu-seed/EFI/ubuntu/ /sysroot/boot/grub
 cp /run/mnt/ubuntu-seed/systems/*/grubenv /sysroot/boot/grub/
diff --git a/factory/usr/lib/the-tool b/factory/usr/lib/the-tool
index 9213b4d..7fbcdb9 100755
--- a/factory/usr/lib/the-tool
+++ b/factory/usr/lib/the-tool
@@ -3,7 +3,10 @@ set -e
 cmd="systemd-mount --no-block --no-pager --no-ask-password"
 # Mount base
 #$cmd /run/mnt/ubuntu-seed/snaps/core20_*.snap /run/mnt/base
-$cmd /run/mnt/ubuntu-seed/snaps/core20_*.snap /sysroot -pBefore=initrd-cleanup.target -pLazyUnmount=true
+# XXX: core20 can be under /snaps and /systems/$label/snaps
+# XXX2: snap-bootstrap initramfs-mounts should handle this correctly
+core20=$(find /run/mnt/ubuntu-seed/ -name "core20_*.snap")
+$cmd $core20 /sysroot -pBefore=initrd-cleanup.target -pLazyUnmount=true
 cp /run/systemd/transient/*.mount /etc/systemd/system
 # Mount writable
 #$cmd --type=tmpfs tmpfs /run/mnt/ubuntu-data