Blame 0094-systemd-initrd-switch-root.service-call-switch-root-.patch
|
Harald Hoyer |
a66b47 |
From 3780d7e44982b0e801622f5ad90ce0e80792b69e Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
a66b47 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
a66b47 |
Date: Tue, 17 Jul 2012 11:09:17 +0200
|
|
Harald Hoyer |
a66b47 |
Subject: [PATCH] systemd/initrd-switch-root.service: call switch-root with
|
|
Harald Hoyer |
a66b47 |
--no-block
|
|
Harald Hoyer |
a66b47 |
|
|
Harald Hoyer |
a66b47 |
---
|
|
Harald Hoyer |
a66b47 |
modules.d/98systemd/initrd-switch-root.service | 3 ++-
|
|
Harald Hoyer |
a66b47 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
Harald Hoyer |
a66b47 |
|
|
Harald Hoyer |
a66b47 |
diff --git a/modules.d/98systemd/initrd-switch-root.service b/modules.d/98systemd/initrd-switch-root.service
|
|
Harald Hoyer |
a66b47 |
index 7b59e15..7d1a648 100644
|
|
Harald Hoyer |
a66b47 |
--- a/modules.d/98systemd/initrd-switch-root.service
|
|
Harald Hoyer |
a66b47 |
+++ b/modules.d/98systemd/initrd-switch-root.service
|
|
Harald Hoyer |
a66b47 |
@@ -11,12 +11,13 @@ DefaultDependencies=no
|
|
Harald Hoyer |
a66b47 |
ConditionPathExists=/etc/initrd-release
|
|
Harald Hoyer |
a66b47 |
OnFailure=emergency.service
|
|
Harald Hoyer |
a66b47 |
After=initrd-switch-root.target
|
|
Harald Hoyer |
a66b47 |
+AllowIsolate=yes
|
|
Harald Hoyer |
a66b47 |
|
|
Harald Hoyer |
a66b47 |
[Service]
|
|
Harald Hoyer |
a66b47 |
Type=oneshot
|
|
Harald Hoyer |
a66b47 |
EnvironmentFile=/run/initramfs/switch-root.conf
|
|
Harald Hoyer |
a66b47 |
# we have to use "--force" here, otherwise systemd would umount /run
|
|
Harald Hoyer |
a66b47 |
-ExecStart=/usr/bin/systemctl --force switch-root ${NEWROOT} ${NEWINIT}
|
|
Harald Hoyer |
a66b47 |
+ExecStart=-/usr/bin/systemctl --no-block --force switch-root ${NEWROOT} ${NEWINIT}
|
|
Harald Hoyer |
a66b47 |
ExecStopPost=-/bin/rm -f /run/initramfs/switch-root.conf
|
|
Harald Hoyer |
a66b47 |
StandardInput=null
|
|
Harald Hoyer |
a66b47 |
StandardOutput=null
|