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