teknoraver / rpms / systemd

Forked from rpms/systemd 2 months ago
Clone

Blame 0071-systemd-nspawn-.service-start-after-var-lib-machines.patch

Zbigniew Jędrzejewski-Szmek f4a676
From dd8fe7cf46d372a012d01192949b8ba62887c996 Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek f4a676
From: Josef Gajdusek <atx@atx.name>
Zbigniew Jędrzejewski-Szmek f4a676
Date: Tue, 6 Jun 2017 17:18:22 +0200
Zbigniew Jędrzejewski-Szmek f4a676
Subject: [PATCH] systemd-nspawn@.service: start after /var/lib/machines is
Zbigniew Jędrzejewski-Szmek f4a676
 mounted (#6079)
Zbigniew Jędrzejewski-Szmek f4a676
Zbigniew Jędrzejewski-Szmek f4a676
This fixes a race condition during boot, where an nspawn container would start
Zbigniew Jędrzejewski-Szmek f4a676
before /var/lib/machines got mounted resulting in a failure.
Zbigniew Jędrzejewski-Szmek f4a676
(cherry picked from commit be5bd2ec62dd7cedd56da82296b9296918806b48)
Zbigniew Jędrzejewski-Szmek f4a676
---
Zbigniew Jędrzejewski-Szmek f4a676
 units/systemd-nspawn@.service.in | 1 +
Zbigniew Jędrzejewski-Szmek f4a676
 1 file changed, 1 insertion(+)
Zbigniew Jędrzejewski-Szmek f4a676
Zbigniew Jędrzejewski-Szmek f4a676
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
Zbigniew Jędrzejewski-Szmek f4a676
index 8c0685aef5..5e80054a57 100644
Zbigniew Jędrzejewski-Szmek f4a676
--- a/units/systemd-nspawn@.service.in
Zbigniew Jędrzejewski-Szmek f4a676
+++ b/units/systemd-nspawn@.service.in
Zbigniew Jędrzejewski-Szmek f4a676
@@ -11,6 +11,7 @@ Documentation=man:systemd-nspawn(1)
Zbigniew Jędrzejewski-Szmek f4a676
 PartOf=machines.target
Zbigniew Jędrzejewski-Szmek f4a676
 Before=machines.target
Zbigniew Jędrzejewski-Szmek f4a676
 After=network.target systemd-resolved.service
Zbigniew Jędrzejewski-Szmek f4a676
+RequiresMountsFor=/var/lib/machines
Zbigniew Jędrzejewski-Szmek f4a676
 
Zbigniew Jędrzejewski-Szmek f4a676
 [Service]
Zbigniew Jędrzejewski-Szmek f4a676
 ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i