rpms/dracut
5
0
Fork 0
Code Issues Pull Requests Releases Activity

dracut-020-84.git20120711

Browse Source 
- add back "--force" to switch-root, otherwise systemd umounts /run
This commit is contained in:
Harald Hoyer 2012-07-11 16:38:53 +02:00
parent 08211a18b7
commit 43b21102ee
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0083-systemd-initrd-switch-root.service-add-back-force-to.patch Normal file
View File

@ -0,0 +1,27 @@
From 2499c305f92cc00474de9790d99abcdc1360d4dd Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 11 Jul 2012 16:36:05 +0200
Subject: [PATCH] systemd/initrd-switch-root.service: add back "--force" to
switch-root
otherwise systemd does umount /run et.al.
---
modules.d/98systemd/initrd-switch-root.service | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/modules.d/98systemd/initrd-switch-root.service b/modules.d/98systemd/initrd-switch-root.service
index bdc4587..e38f04d 100644
--- a/modules.d/98systemd/initrd-switch-root.service
+++ b/modules.d/98systemd/initrd-switch-root.service
@@ -16,8 +16,10 @@ Before=systemd-journal-flush.service
[Service]
Type=oneshot
EnvironmentFile=/run/initramfs/switch-root.conf
-ExecStart=/usr/bin/systemctl switch-root ${NEWROOT} ${NEWINIT}
+# we have to use "--force" here, otherwise systemd would umount /run
+ExecStart=/usr/bin/systemctl --force switch-root ${NEWROOT} ${NEWINIT}
ExecStopPost=-/usr/bin/systemctl stop systemd-journald.service
+ExecStopPost=-/bin/rm -f /run/initramfs/switch-root.conf
StandardInput=null
StandardOutput=null
StandardError=null

6
dracut.spec
View File

@ -10,7 +10,7 @@
Name: dracut
Version: 020
Release: 83.git20120711%{?dist}
Release: 84.git20120711%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@ -111,6 +111,7 @@ Patch79: 0079-test-silence-make-all.patch
Patch80: 0080-systemd-fixed-initrd-switch-root.service.patch
Patch81: 0081-dracut.sh-for-include-copy-also-the-symbolic-links.patch
Patch82: 0082-install-dracut-install.c-check-for-empty-or-destdir.patch
Patch83: 0083-systemd-initrd-switch-root.service-add-back-force-to.patch
BuildRequires: dash bash git
@ -437,6 +438,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
* Wed Jul 11 2012 Harald Hoyer <harald@redhat.com> 020-84.git20120711
- add back "--force" to switch-root, otherwise systemd umounts /run
* Wed Jul 11 2012 Harald Hoyer <harald@redhat.com> 020-83.git20120711
- more systemd journal fixes
- nfs module fix