commit fa700b62ef31a47c02d48c245112f6499f49c35c
Author: Jan Rękorajski <[email protected]>
Date: Thu Mar 21 14:53:48 2013 +0100
- don't hardcode systemctl path in servce files
systemctl-path.patch | 29 +++++++++++++++++++++++++++++
systemd.spec | 7 ++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/systemd.spec b/systemd.spec
index 5ab64f3..31017f0 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -15,7 +15,7 @@ Summary(pl.UTF-8): systemd - zarządca systemu i usług dla
Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are
incompatible/breaking changes very often)
Version: 198
-Release: 3
+Release: 3.1
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
@@ -567,8 +567,13 @@ Wiązania do Systemd dla Pythona.
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
cp -p %{SOURCE2} src/systemd_booted.c
+%{__mv} units/initrd-cleanup.service{,.in}
+%{__mv} units/initrd-parse-etc.service{,.in}
+%{__mv} units/initrd-switch-root.service{,.in}
+
%build
%{__gtkdocize}
%{__libtoolize}
diff --git a/systemctl-path.patch b/systemctl-path.patch
new file mode 100644
index 0000000..9edacd9
--- /dev/null
+++ b/systemctl-path.patch
@@ -0,0 +1,29 @@
+--- systemd-198/units/initrd-cleanup.service~ 2013-03-07 13:07:09.946850823
+0100
++++ systemd-198/units/initrd-cleanup.service 2013-03-21 14:50:00.400052081
+0100
+@@ -15,4 +15,4 @@
+
+ [Service]
+ Type=oneshot
+-ExecStart=/usr/bin/systemctl --no-block isolate initrd-switch-root.target
++ExecStart=@SYSTEMCTL@ --no-block isolate initrd-switch-root.target
+--- systemd-198/units/initrd-parse-etc.service~ 2013-03-07
13:07:09.946850823 +0100
++++ systemd-198/units/initrd-parse-etc.service 2013-03-21 14:50:59.820556209
+0100
+@@ -15,6 +15,6 @@
+
+ [Service]
+ Type=oneshot
+-ExecStartPre=/usr/bin/systemctl daemon-reload
+-ExecStart=/usr/bin/systemctl start local-fs.target
+-ExecStart=/usr/bin/systemctl --no-block start initrd-cleanup.service
++ExecStartPre=@SYSTEMCTL@ daemon-reload
++ExecStart=@SYSTEMCTL@ start local-fs.target
++ExecStart=@SYSTEMCTL@ --no-block start initrd-cleanup.service
+--- systemd-198/units/initrd-switch-root.service~ 2013-03-05
00:43:05.950383752 +0100
++++ systemd-198/units/initrd-switch-root.service 2013-03-21
14:51:14.987351504 +0100
+@@ -15,5 +15,5 @@
+ [Service]
+ Type=oneshot
+ # we have to use "--force" here, otherwise systemd would umount /run
+-ExecStart=/usr/bin/systemctl --no-block --force switch-root /sysroot
++ExecStart=@SYSTEMCTL@ --no-block --force switch-root /sysroot
+ KillMode=none
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/fa700b62ef31a47c02d48c245112f6499f49c35c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
