diff options
| author | Harald Hoyer <harald@redhat.com> | 2012-07-11 16:38:53 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2012-07-11 16:38:53 +0200 |
| commit | 43b21102ee78cfbeb6edb0481789b05228f73cf3 (patch) | |
| tree | 0a3de15416948d80caac9cb8abf291ca20a3e503 | |
| parent | 08211a18b7d36268e4a4ed84f7ee0f550b6fbdad (diff) | |
| download | dracut-43b21102ee78cfbeb6edb0481789b05228f73cf3.tar.gz dracut-43b21102ee78cfbeb6edb0481789b05228f73cf3.tar.xz dracut-43b21102ee78cfbeb6edb0481789b05228f73cf3.zip | |
dracut-020-84.git20120711
- add back "--force" to switch-root, otherwise systemd umounts /run
| -rw-r--r-- | 0083-systemd-initrd-switch-root.service-add-back-force-to.patch | 27 | ||||
| -rw-r--r-- | dracut.spec | 6 |
2 files changed, 32 insertions, 1 deletions
diff --git a/0083-systemd-initrd-switch-root.service-add-back-force-to.patch b/0083-systemd-initrd-switch-root.service-add-back-force-to.patch new file mode 100644 index 0000000..949fb14 --- /dev/null +++ b/0083-systemd-initrd-switch-root.service-add-back-force-to.patch @@ -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 diff --git a/dracut.spec b/dracut.spec index ff1b2d6..eed92f3 100644 --- a/dracut.spec +++ b/dracut.spec @@ -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 |