daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
661545
From d6f32f9063f5e7bb7864fb6be014a52e6036b111 Mon Sep 17 00:00:00 2001
661545
From: Franck Bui <fbui@suse.com>
661545
Date: Mon, 28 Jan 2019 12:07:37 +0100
661545
Subject: [PATCH] units: make sure initrd-cleanup.service terminates before
661545
 switching to rootfs
661545
661545
A follow-up for commit a8cb1dc3e0fa81aff.
661545
661545
Commit a8cb1dc3e0fa81aff made sure that initrd-cleanup.service won't be stopped
661545
when initrd-switch-root.target is isolated.
661545
661545
However even with this change, it might happen that initrd-cleanup.service
661545
survives the switch to rootfs (since it has no ordering constraints against
661545
initrd-switch-root.target) and is stopped right after when default.target is
661545
isolated. This led to initrd-cleanup.service entering in failed state as it
661545
happens when oneshot services are stopped.
661545
661545
This patch along with a8cb1dc3e0fa81aff should fix issue #4343.
661545
661545
Fixes: #4343
661545
(cherry picked from commit e2c7c94ea35fe7e669afb51bfc2251158b522ea5)
661545
661545
Related: #1560417
661545
---
661545
 units/initrd-switch-root.target | 2 +-
661545
 1 file changed, 1 insertion(+), 1 deletion(-)
661545
661545
diff --git a/units/initrd-switch-root.target b/units/initrd-switch-root.target
661545
index 934d82f667..ada5b9e7fd 100644
661545
--- a/units/initrd-switch-root.target
661545
+++ b/units/initrd-switch-root.target
661545
@@ -13,4 +13,4 @@ Requires=initrd-switch-root.service
661545
 Before=initrd-switch-root.service
661545
 AllowIsolate=yes
661545
 Wants=initrd-udevadm-cleanup-db.service initrd-root-fs.target initrd-fs.target systemd-journald.service initrd-cleanup.service
661545
-After=initrd-udevadm-cleanup-db.service initrd-root-fs.target initrd-fs.target emergency.service emergency.target
661545
+After=initrd-udevadm-cleanup-db.service initrd-root-fs.target initrd-fs.target emergency.service emergency.target initrd-cleanup.service