- fix paths to systemctl

diff --git a/dracut.spec b/dracut.spec
index 777031a673a8e75b2d5fe0f3a89695d268f0d2a1..1dee9d8256a1b3c0323f32ee20fdc8c639596f60 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -2,7 +2,7 @@ Summary:        Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
 Version:       026
-Release:       1
+Release:       1.1
 License:       GPL v2+
 Group:         Base
 Source0:       http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
@@ -13,6 +13,7 @@ Patch1:               plymouth-libexec.patch
 Patch2:                os-release.patch
 Patch3:                plymouth-logo.patch
 Patch4:                arch-libdir.patch
+Patch5:                systemd-paths.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
@@ -179,6 +180,7 @@ konfiguracji maszyn.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh

diff --git a/systemd-paths.patch b/systemd-paths.patch
new file mode 100644 (file)
index 0000000..c8dd2a4
--- /dev/null
+++ b/systemd-paths.patch
@@ -0,0 +1,22 @@
+--- dracut-026/modules.d/98systemd/emergency.service~  2013-03-08 07:07:48.000000000 +0100
++++ dracut-026/modules.d/98systemd/emergency.service   2013-03-21 13:23:14.644737989 +0100
+@@ -17,7 +17,7 @@
+ Environment=HOME=/
+ WorkingDirectory=/
+ ExecStart=/bin/dracut-emergency
+-ExecStopPost=-/usr/bin/systemctl --no-block isolate dracut.target
++ExecStopPost=-/bin/systemctl --no-block isolate dracut.target
+ Type=oneshot
+ StandardInput=tty-force
+ StandardOutput=inherit
+--- dracut-026/modules.d/98systemd/rescue.service~     2013-03-08 07:07:48.000000000 +0100
++++ dracut-026/modules.d/98systemd/rescue.service      2013-03-21 13:23:51.761696508 +0100
+@@ -17,7 +17,7 @@
+ ExecStartPre=-/bin/plymouth quit
+ ExecStart=-/bin/sh -i -l
+ ExecStopPost=-/bin/rm -f /.console_lock
+-ExecStopPost=-/usr/bin/systemctl --fail --no-block default
++ExecStopPost=-/bin/systemctl --fail --no-block default
+ Type=idle
+ StandardInput=tty-force
+ StandardOutput=inherit