RequireMountsFor in systemd-nspawn should wait for machine mount

This patch modifies the RequireMountsFor setting in systemd-nspawn@.service to wait for the machine instance directory to be mounted, not just /var/lib/machines.

Closes #14931

diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index 51634472ac35c4dfff6ced1ae531b7706898b3f0..c91c92707e060826c9e3fa5ed751de6a4fe248ff 100644 (file)
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -14,7 +14,7 @@ Wants=modprobe@tun.service modprobe@loop.service modprobe@dm-mod.service
 PartOf=machines.target
 Before=machines.target
 After=network.target systemd-resolved.service modprobe@tun.service modprobe@loop.service modprobe@dm-mod.service
-RequiresMountsFor=/var/lib/machines
+RequiresMountsFor=/var/lib/machines/%i
 
 [Service]
 # Make sure the DeviceAllow= lines below can properly resolve the 'block-loop' expression (and others)