diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2020-02-13 10:00:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-14 13:07:23 +0000 |
commit | 3070342f0ec68b44e191298d7c9357e9a9eada9a (patch) | |
tree | 41e22091b0ab3f888fe8a2c6ba184f97b9022729 /meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch | |
parent | e2fa65d1acd4d27c5506602a4ad90318f04966d4 (diff) | |
download | poky-3070342f0ec68b44e191298d7c9357e9a9eada9a.tar.gz |
iputils: Fix systemd and ipv6 detection
When systemd is enabled, ensure iputils detects it correctly. Split out
IPv6 only features based on ipv6 enabled in DISTRO_FEATURES.
(From OE-Core rev: e742e5f711d46b1664cc5bec2f788dc0e020ccaa)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch')
-rw-r--r-- | meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch new file mode 100644 index 0000000000..d7367caf78 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
3 | Date: Thu, 13 Feb 2020 06:08:45 +0000 | ||
4 | Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers | ||
5 | |||
6 | Neither rarpd nor rdisc can gain the necessary capabilities with | ||
7 | PrivateUsers enabled. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
11 | --- | ||
12 | systemd/rarpd.service.in | 1 - | ||
13 | systemd/rdisc.service.in | 3 ++- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in | ||
17 | index e600c10c93e6..f5d7621a7ce8 100644 | ||
18 | --- a/systemd/rarpd.service.in | ||
19 | +++ b/systemd/rarpd.service.in | ||
20 | @@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW | ||
21 | DynamicUser=yes | ||
22 | PrivateTmp=yes | ||
23 | PrivateDevices=yes | ||
24 | -PrivateUsers=yes | ||
25 | ProtectSystem=strict | ||
26 | ProtectHome=yes | ||
27 | ProtectControlGroups=yes | ||
28 | diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in | ||
29 | index 4e2a1ec9d0e5..a71b87d36b37 100644 | ||
30 | --- a/systemd/rdisc.service.in | ||
31 | +++ b/systemd/rdisc.service.in | ||
32 | @@ -8,9 +8,10 @@ After=network.target | ||
33 | EnvironmentFile=-/etc/sysconfig/rdisc | ||
34 | ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS | ||
35 | |||
36 | +CapabilityBoundingSet=CAP_NET_RAW | ||
37 | AmbientCapabilities=CAP_NET_RAW | ||
38 | PrivateTmp=yes | ||
39 | -PrivateUsers=yes | ||
40 | +DynamicUser=yes | ||
41 | ProtectSystem=strict | ||
42 | ProtectHome=yes | ||
43 | ProtectControlGroups=yes | ||
44 | -- | ||
45 | 2.17.1 | ||
46 | |||