- fix autogenerated fsck-root service

diff --git a/root-lib.patch b/root-lib.patch
new file mode 100644 (file)
index 0000000..c70aee1
--- /dev/null
+++ b/root-lib.patch
@@ -0,0 +1,11 @@
+--- systemd-220/src/shared/generator.c~        2015-05-15 17:06:10.000000000 +0200
++++ systemd-220/src/shared/generator.c 2015-05-25 21:21:02.031196707 +0200
+@@ -61,7 +61,7 @@
+                 "[Service]\n"
+                 "Type=oneshot\n"
+                 "RemainAfterExit=yes\n"
+-                "ExecStart=/usr/lib/systemd/systemd-fsck %2$s\n"
++                "ExecStart=/lib/systemd/systemd-fsck %2$s\n"
+                 "TimeoutSec=0\n",
+                 program_invocation_short_name,
+                 what,

diff --git a/systemd.spec b/systemd.spec
index 2326396ba8e0ad87614d56fdb8073815a51a8666..14516cbb2c4cc61aa78e8480068cd78f709b3955 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -66,6 +66,7 @@ Patch16:      systemd-configfs.patch
 Patch17:       pld-boot_efi_mount.patch
 Patch18:       optional-tmp-on-tmpfs.patch
 Patch19:       uids_gids.patch
+Patch20:       root-lib.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -678,6 +679,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 # this file is autogenerated
@@ -723,7 +725,7 @@ cp -p %{SOURCE2} src/systemd_booted.c
        --with-rootprefix="" \
        --with-rootlibdir=/%{_lib}
 
-%{__make} -j1
+%{__make}
 ./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon
 
 %{?with_tests:%{__make} check}