Merge ~anonymouse67/ubuntu-core-initramfs:feature/uc20-run-mnt-data into ~canonical-foundations/ubuntu-core-initramfs:master

[Ian Johnson]

This is necessary to stop using /run/mnt/ubuntu-data from snap-bootstrap and everywhere really as per the new design on the names.

The associated snapd PR has yet to be merged but is dependent on this MP, see https://github.com/snapcore/snapd/pull/8464

[Dimitri John Ledkov (xnox)]

Is this ready to be merged now? or doesn't need to be after PR8464?

What's the ordering sequence here?

[Ian Johnson (anonymouse67)]

This needs to be merged after https://github.com/snapcore/snapd/pull/8610 is merged and released. Michael said he would take care of that in his AM on Thursday

[Michael Vogt (mvo)]

This is ready to be merged now.

[Michael Vogt (mvo)]

LGTM

review: Approve

[Łukasz Zemczak (sil2100)]

Ok.

review: Approve

diff --git a/factory/usr/lib/systemd/system/populate-writable.service b/factory/usr/lib/systemd/system/populate-writable.service
index 30d9ae3..c914015 100644
--- a/factory/usr/lib/systemd/system/populate-writable.service
+++ b/factory/usr/lib/systemd/system/populate-writable.service
@@ -3,12 +3,12 @@ OnFailure=emergency.target
 OnFailureJobMode=replace-irreversibly
 Before=initrd-cleanup.target
 After=run-mnt-ubuntu\x2dseed.mount
-After=run-mnt-ubuntu\x2ddata.mount
+After=run-mnt-data.mount
 After=run-mnt-base.mount
 After=sysroot.mount
 After=sysroot-writable.mount
 Requires=run-mnt-ubuntu\x2dseed.mount
-Requires=run-mnt-ubuntu\x2ddata.mount
+Requires=run-mnt-data.mount
 Requires=run-mnt-base.mount
 Requires=sysroot.mount
 Requires=sysroot-writable.mount
diff --git a/factory/usr/lib/systemd/system/run-mnt-data.mount.wants/sysroot-writable.mount b/factory/usr/lib/systemd/system/run-mnt-data.mount.wants/sysroot-writable.mount
new file mode 120000
index 0000000..0d3b832
--- /dev/null
+++ b/factory/usr/lib/systemd/system/run-mnt-data.mount.wants/sysroot-writable.mount
@@ -0,0 +1 @@
+../sysroot-writable.mount
\ No newline at end of file
diff --git "a/factory/usr/lib/systemd/system/run-mnt-ubuntu\\x2ddata.mount.wants/sysroot-writable.mount" "b/factory/usr/lib/systemd/system/run-mnt-ubuntu\\x2ddata.mount.wants/sysroot-writable.mount"
deleted file mode 120000
index 0d3b832..0000000
--- "a/factory/usr/lib/systemd/system/run-mnt-ubuntu\\x2ddata.mount.wants/sysroot-writable.mount"
+++ /dev/null
@@ -1 +0,0 @@
-../sysroot-writable.mount
\ No newline at end of file
diff --git a/factory/usr/lib/systemd/system/sysroot-writable.mount b/factory/usr/lib/systemd/system/sysroot-writable.mount
index 8d614a5..1006ff7 100644
--- a/factory/usr/lib/systemd/system/sysroot-writable.mount
+++ b/factory/usr/lib/systemd/system/sysroot-writable.mount
@@ -1,15 +1,15 @@
 [Unit]
 Before=initrd-cleanup.target
-After=run-mnt-ubuntu\x2ddata.mount
+After=run-mnt-data.mount
 After=run-mnt-base.mount
 After=sysroot.mount
 After=the-tool.service
-Requires=run-mnt-ubuntu\x2ddata.mount
+Requires=run-mnt-data.mount
 Requires=run-mnt-base.mount
 Requires=sysroot.mount
 Requires=the-tool.service
 Wants=populate-writable.service
 [Mount]
-What=/run/mnt/ubuntu-data
+What=/run/mnt/data
 Type=none
 Options=bind