| 1 |
commit: d323ea527c3f8e3b3803a39af5fd57254edeaadf |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 1 16:27:04 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 1 16:31:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d323ea52 |
| 7 |
|
| 8 |
sys-apps/systemd: add initctl patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81 |
| 11 |
|
| 12 |
sys-apps/systemd/files/238-initctl.patch | 46 ++++++++++++++++++++++++++++++++ |
| 13 |
sys-apps/systemd/systemd-238-r3.ebuild | 1 + |
| 14 |
2 files changed, 47 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sys-apps/systemd/files/238-initctl.patch b/sys-apps/systemd/files/238-initctl.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..39991697743 |
| 19 |
--- /dev/null |
| 20 |
+++ b/sys-apps/systemd/files/238-initctl.patch |
| 21 |
@@ -0,0 +1,46 @@ |
| 22 |
+From 4d8c7c1b3a5feebca948a3b8663f5be887b57731 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Mike Gilbert <floppym@g.o> |
| 24 |
+Date: Fri, 30 Mar 2018 11:00:17 -0400 |
| 25 |
+Subject: [PATCH] units: initctl: move the fifo to /run/initctl to match |
| 26 |
+ sysvinit |
| 27 |
+ |
| 28 |
+The fifo location was moved in sysvinit-2.89. |
| 29 |
+ |
| 30 |
+http://git.savannah.nongnu.org/cgit/sysvinit.git/commit/?id=80dbcf3de3c1b83aeaa713a8fe5b8d35d8649af2 |
| 31 |
+--- |
| 32 |
+ units/systemd-initctl.service.in | 2 +- |
| 33 |
+ units/systemd-initctl.socket | 4 ++-- |
| 34 |
+ 2 files changed, 3 insertions(+), 3 deletions(-) |
| 35 |
+ |
| 36 |
+diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in |
| 37 |
+index 6cfed3da11f..2b4b957dce3 100644 |
| 38 |
+--- a/units/systemd-initctl.service.in |
| 39 |
++++ b/units/systemd-initctl.service.in |
| 40 |
+@@ -8,7 +8,7 @@ |
| 41 |
+ # (at your option) any later version. |
| 42 |
+ |
| 43 |
+ [Unit] |
| 44 |
+-Description=/dev/initctl Compatibility Daemon |
| 45 |
++Description=initctl Compatibility Daemon |
| 46 |
+ Documentation=man:systemd-initctl.service(8) |
| 47 |
+ DefaultDependencies=no |
| 48 |
+ |
| 49 |
+diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket |
| 50 |
+index 61f877ba7d2..9d975799081 100644 |
| 51 |
+--- a/units/systemd-initctl.socket |
| 52 |
++++ b/units/systemd-initctl.socket |
| 53 |
+@@ -8,12 +8,12 @@ |
| 54 |
+ # (at your option) any later version. |
| 55 |
+ |
| 56 |
+ [Unit] |
| 57 |
+-Description=/dev/initctl Compatibility Named Pipe |
| 58 |
++Description=initctl Compatibility Named Pipe |
| 59 |
+ Documentation=man:systemd-initctl.service(8) |
| 60 |
+ DefaultDependencies=no |
| 61 |
+ Before=sockets.target |
| 62 |
+ |
| 63 |
+ [Socket] |
| 64 |
+-ListenFIFO=/run/systemd/initctl/fifo |
| 65 |
++ListenFIFO=/run/initctl |
| 66 |
+ Symlinks=/dev/initctl |
| 67 |
+ SocketMode=0600 |
| 68 |
|
| 69 |
diff --git a/sys-apps/systemd/systemd-238-r3.ebuild b/sys-apps/systemd/systemd-238-r3.ebuild |
| 70 |
index 813d4f96708..b68ed0bf92a 100644 |
| 71 |
--- a/sys-apps/systemd/systemd-238-r3.ebuild |
| 72 |
+++ b/sys-apps/systemd/systemd-238-r3.ebuild |
| 73 |
@@ -154,6 +154,7 @@ src_prepare() { |
| 74 |
|
| 75 |
PATCHES+=( |
| 76 |
"${FILESDIR}/238-libmount-include.patch" |
| 77 |
+ "${FILESDIR}/238-initctl.patch" |
| 78 |
) |
| 79 |
|
| 80 |
if ! use vanilla; then |
Archives