summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-11-08 22:06:01 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-11-20 07:02:52 +0300
commitb67eddece72719def8d88f525a38a49ff981b0d4 (patch)
tree88c405fbd30b886038510bdc93837d990a43e161 /meta-phosphor/recipes-core/systemd/systemd_%.bbappend
parent7ead6495b6d6782dd89951e8bfb26131f35863ec (diff)
downloadopenbmc-b67eddece72719def8d88f525a38a49ff981b0d4.tar.xz
Revert "Don't return the error if unable to create the network namespace"
This reverts commit 87497e8ebce78079ea5423ecb6080e82cfa36106. systemd-hostnamed no longer hangs without network namespace support: PrivateNetwork=yes is configured, but the kernel does not support network namespaces, ignoring. (From meta-phosphor rev: 3b6dd35154ba5e105ad1d4b65746711654ed34b0) Change-Id: I41b5e1ae952b8bc3bc07819d7ab7e0fffd3629c7 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-core/systemd/systemd_%.bbappend')
-rw-r--r--meta-phosphor/recipes-core/systemd/systemd_%.bbappend3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
index 7a4f49c07..9611cabae 100644
--- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
@@ -8,9 +8,6 @@ PACKAGECONFIG_remove = "machined hibernate ldconfig binfmt backlight localed \
FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
SRC_URI += "file://default.network"
SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch"
-#TODO upstream the below patch via below issue
-#https://github.com/openbmc/openbmc/issues/2016
-SRC_URI += "file://0005-dont-return-error-if-unable-to-create-network-namespace.patch"
SRC_URI += "file://0006-core-fix-the-check-if-CONFIG_CGROUP_BPF-is-on.patch"
RRECOMMENDS_${PN} += "obmc-targets"