<div dir="ltr"><div><div>The patch (Ensure-kdbus-isn-t-<wbr>used-3501.patch) is already part of systemd v2.3.1.<br>The issue comes on systemd < 2.3.1.<br><br></div>Regards,<br></div>Jagadeesh <br><div><div><div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 27, 2017 at 7:11 AM, Khem Raj <span dir="ltr"><<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span class="gmail-">On Thu, Nov 23, 2017 at 10:09 AM, Armin Kuster <<a href="mailto:akuster808@gmail.com">akuster808@gmail.com</a>> wrote:<br>
> From: Armin Kuster <<a href="mailto:akuster@mvista.com">akuster@mvista.com</a>><br>
><br>
> With out this patch, one can not login to a mips64 machine like qumumips64 or Octeon mips64 when<br>
> systemd is enabled.<br>
><br>
> remove PACKAGECONFIG option too<br>
><br>
> affects: systemd < 2.3.2<br>
</span> ^^^^^<br>
<br>
a typo otherwise ok.<br>
<div class="gmail-HOEnZb"><div class="gmail-h5"><br>
><br>
> Reviewed-by: Jeremy Puhlman <<a href="mailto:jpuhlman@mvista.com">jpuhlman@mvista.com</a>><br>
> Signed-off-by: Jagadeesh Krishnanjanappa <<a href="mailto:jkrishnanjanappa@mvista.com">jkrishnanjanappa@mvista.com</a>><br>
> Signed-off-by: Armin Kuster <<a href="mailto:akuster@mvista.com">akuster@mvista.com</a>><br>
> ---<br>
> .../systemd/Ensure-kdbus-isn-<wbr>t-used-3501.patch | 670 +++++++++++++++++++++<br>
> meta/recipes-core/systemd/<a href="http://systemd_230.bb" rel="noreferrer" target="_blank">syst<wbr>emd_230.bb</a> | 3 +-<br>
> 2 files changed, 671 insertions(+), 2 deletions(-)<br>
> create mode 100644 meta/recipes-core/systemd/<wbr>systemd/Ensure-kdbus-isn-t-<wbr>used-3501.patch<br>
><br>
> diff --git a/meta/recipes-core/systemd/<wbr>systemd/Ensure-kdbus-isn-t-<wbr>used-3501.patch b/meta/recipes-core/systemd/<wbr>systemd/Ensure-kdbus-isn-t-<wbr>used-3501.patch<br>
> new file mode 100644<br>
> index 0000000..d08a10f<br>
> --- /dev/null<br>
> +++ b/meta/recipes-core/systemd/<wbr>systemd/Ensure-kdbus-isn-t-<wbr>used-3501.patch<br>
> @@ -0,0 +1,670 @@<br>
> +From 222953e87f34545a3f9c6d3c18216e<wbr>222bf6ea94 Mon Sep 17 00:00:00 2001<br>
> +From: Dave Reisner <<a href="mailto:dreisner@archlinux.org">dreisner@archlinux.org</a>><br>
> +Date: Fri, 10 Jun 2016 09:50:16 -0400<br>
> +Subject: [PATCH] Ensure kdbus isn't used (#3501)<br>
> +<br>
> +Delete the dbus1 generator and some critical wiring. This prevents<br>
> +kdbus from being loaded or detected. As such, it will never be used,<br>
> +even if the user still has a useful kdbus module loaded on their system.<br>
> +<br>
> +Sort of fixes #3480. Not really, but it's better than the current state.<br>
> +<br>
> +Upstream-Status: Backport<br>
> +Signed-off-by: Armin Kuster <<a href="mailto:akuster@mvista.com">akuster@mvista.com</a>><br>
> +<br>
> +---<br>
> + Makefile.am | 20 --<br>
> + autogen.sh | 12 +-<br>
> + <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 10 -<br>
> + src/core/busname.c | 7 +-<br>
> + src/core/kmod-setup.c | 3 -<br>
> + src/core/manager.c | 23 ---<br>
> + src/core/mount-setup.c | 2 -<br>
> + src/core/service.c | 17 +-<br>
> + src/dbus1-generator/dbus1-<wbr>generator.c | 331 ------------------------------<wbr>----<br>
> + src/login/pam_systemd.c | 31 ++--<br>
> + src/shared/bus-util.c | 34 ----<br>
> + src/shared/bus-util.h | 3 -<br>
> + 12 files changed, 23 insertions(+), 470 deletions(-)<br>
> + delete mode 100644 src/dbus1-generator/dbus1-<wbr>generator.c<br>
> +<br>
> +Index: git/autogen.sh<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/autogen.sh<br>
> ++++ git/autogen.sh<br>
> +@@ -55,19 +55,19 @@ fi<br>
> + cd $oldpwd<br>
> +<br>
> + if [ "x$1" = "xc" ]; then<br>
> +- $topdir/configure CFLAGS='-g -O0 -ftrapv' --enable-kdbus $args<br>
> ++ $topdir/configure CFLAGS='-g -O0 -ftrapv' $args<br>
> + make clean<br>
> + elif [ "x$1" = "xg" ]; then<br>
> +- $topdir/configure CFLAGS='-g -Og -ftrapv' --enable-kdbus $args<br>
> ++ $topdir/configure CFLAGS='-g -Og -ftrapv' $args<br>
> + make clean<br>
> + elif [ "x$1" = "xa" ]; then<br>
> +- $topdir/configure CFLAGS='-g -O0 -Wsuggest-attribute=pure -Wsuggest-attribute=const -ftrapv' --enable-kdbus $args<br>
> ++ $topdir/configure CFLAGS='-g -O0 -Wsuggest-attribute=pure -Wsuggest-attribute=const -ftrapv' $args<br>
> + make clean<br>
> + elif [ "x$1" = "xl" ]; then<br>
> +- $topdir/configure CC=clang CFLAGS='-g -O0 -ftrapv' --enable-kdbus $args<br>
> ++ $topdir/configure CC=clang CFLAGS='-g -O0 -ftrapv' $args<br>
> + make clean<br>
> + elif [ "x$1" = "xs" ]; then<br>
> +- scan-build $topdir/configure CFLAGS='-std=gnu99 -g -O0 -ftrapv' --enable-kdbus $args<br>
> ++ scan-build $topdir/configure CFLAGS='-std=gnu99 -g -O0 -ftrapv' $args<br>
> + scan-build make<br>
> + else<br>
> + echo<br>
> +@@ -75,6 +75,6 @@ else<br>
> + echo "Initialized build system. For a common configuration please run:"<br>
> + echo "-----------------------------<wbr>------------------------------<wbr>-----"<br>
> + echo<br>
> +- echo "$topdir/configure CFLAGS='-g -O0 -ftrapv' --enable-kdbus $args"<br>
> ++ echo "$topdir/configure CFLAGS='-g -O0 -ftrapv' $args"<br>
> + echo<br>
> + fi<br>
> +Index: git/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> ++++ git/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> +@@ -1294,16 +1294,6 @@ AC_ARG_WITH(tpm-pcrindex,<br>
> + AC_DEFINE_UNQUOTED(SD_TPM_PCR, [$SD_TPM_PCR], [TPM PCR register number to use])<br>
> +<br>
> + # ------------------------------<wbr>------------------------------<wbr>------------------<br>
> +-have_kdbus=no<br>
> +-AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--disable-<wbr>kdbus], [do not connect to kdbus by default]))<br>
> +-if test "x$enable_kdbus" != "xno"; then<br>
> +- AC_DEFINE(ENABLE_KDBUS, 1, [Define if kdbus is to be connected to by default])<br>
> +- have_kdbus=yes<br>
> +- M4_DEFINES="$M4_DEFINES -DENABLE_KDBUS"<br>
> +-fi<br>
> +-AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"])<br>
> +-<br>
> +-# ------------------------------<wbr>------------------------------<wbr>------------------<br>
> + AC_ARG_WITH(rc-local-script-<wbr>path-start,<br>
> + AS_HELP_STRING([--with-rc-<wbr>local-script-path-start=PATH],<br>
> + [Path to /etc/rc.local]),<br>
> +Index: git/src/core/busname.c<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/src/core/busname.c<br>
> ++++ git/src/core/busname.c<br>
> +@@ -998,12 +998,7 @@ static int busname_get_timeout(Unit *u,<br>
> + }<br>
> +<br>
> + static bool busname_supported(void) {<br>
> +- static int supported = -1;<br>
> +-<br>
> +- if (supported < 0)<br>
> +- supported = is_kdbus_available();<br>
> +-<br>
> +- return supported;<br>
> ++ return false;<br>
> + }<br>
> +<br>
> + static int busname_control_pid(Unit *u) {<br>
> +Index: git/src/core/kmod-setup.c<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/src/core/kmod-setup.c<br>
> ++++ git/src/core/kmod-setup.c<br>
> +@@ -64,9 +64,6 @@ int kmod_setup(void) {<br>
> + /* this should never be a module */<br>
> + { "unix", "/proc/net/unix", true, true, NULL },<br>
> +<br>
> +- /* IPC is needed before we bring up any other services */<br>
> +- { "kdbus", "/sys/fs/kdbus", false, false, is_kdbus_wanted },<br>
> +-<br>
> + #ifdef HAVE_LIBIPTC<br>
> + /* netfilter is needed by networkd, nspawn among others, and cannot be autoloaded */<br>
> + { "ip_tables", "/proc/net/ip_tables_names", false, false, NULL },<br>
> +Index: git/src/core/manager.c<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/src/core/manager.c<br>
> ++++ git/src/core/manager.c<br>
> +@@ -809,28 +809,6 @@ static int manager_setup_cgroups_agent(M<br>
> + return 0;<br>
> + }<br>
> +<br>
> +-static int manager_setup_kdbus(Manager *m) {<br>
> +- _cleanup_free_ char *p = NULL;<br>
> +-<br>
> +- assert(m);<br>
> +-<br>
> +- if (m->test_run || m->kdbus_fd >= 0)<br>
> +- return 0;<br>
> +- if (!is_kdbus_available())<br>
> +- return -ESOCKTNOSUPPORT;<br>
> +-<br>
> +- m->kdbus_fd = bus_kernel_create_bus(<br>
> +- MANAGER_IS_SYSTEM(m) ? "system" : "user",<br>
> +- MANAGER_IS_SYSTEM(m), &p);<br>
> +-<br>
> +- if (m->kdbus_fd < 0)<br>
> +- return log_debug_errno(m->kdbus_fd, "Failed to set up kdbus: %m");<br>
> +-<br>
> +- log_debug("Successfully set up kdbus on %s", p);<br>
> +-<br>
> +- return 0;<br>
> +-}<br>
> +-<br>
> + static int manager_connect_bus(Manager *m, bool reexecuting) {<br>
> + bool try_bus_connect;<br>
> +<br>
> +@@ -1225,7 +1203,6 @@ int manager_startup(Manager *m, FILE *se<br>
> +<br>
> + /* We might have deserialized the kdbus control fd, but if we<br>
> + * didn't, then let's create the bus now. */<br>
> +- manager_setup_kdbus(m);<br>
> + manager_connect_bus(m, !!serialization);<br>
> + bus_track_coldplug(m, &m->subscribed, &m->deserialized_subscribed);<br>
> +<br>
> +Index: git/src/core/mount-setup.c<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/src/core/mount-setup.<wbr>c<br>
> ++++ git/src/core/mount-setup.c<br>
> +@@ -108,8 +108,6 @@ static const MountPoint mount_table[] =<br>
> + { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,<br>
> + is_efi_boot, MNT_NONE },<br>
> + #endif<br>
> +- { "kdbusfs", "/sys/fs/kdbus", "kdbusfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,<br>
> +- is_kdbus_wanted, MNT_IN_CONTAINER },<br>
> + };<br>
> +<br>
> + /* These are API file systems that might be mounted by other software,<br>
> +Index: git/src/core/service.c<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/src/core/service.c<br>
> ++++ git/src/core/service.c<br>
> +@@ -574,20 +574,9 @@ static int service_setup_bus_name(Servic<br>
> + if (!s->bus_name)<br>
> + return 0;<br>
> +<br>
> +- if (is_kdbus_available()) {<br>
> +- const char *n;<br>
> +-<br>
> +- n = strjoina(s->bus_name, ".busname");<br>
> +- r = unit_add_dependency_by_name(<wbr>UNIT(s), UNIT_AFTER, n, NULL, true);<br>
> +- if (r < 0)<br>
> +- return log_unit_error_errno(UNIT(s), r, "Failed to add dependency to .busname unit: %m");<br>
> +-<br>
> +- } else {<br>
> +- /* If kdbus is not available, we know the dbus socket is required, hence pull it in, and require it */<br>
> +- r = unit_add_dependency_by_name(<wbr>UNIT(s), UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, NULL, true);<br>
> +- if (r < 0)<br>
> +- return log_unit_error_errno(UNIT(s), r, "Failed to add dependency on " SPECIAL_DBUS_SOCKET ": %m");<br>
> +- }<br>
> ++ r = unit_add_dependency_by_name(<wbr>UNIT(s), UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, NULL, true);<br>
> ++ if (r < 0)<br>
> ++ return log_unit_error_errno(UNIT(s), r, "Failed to add dependency on " SPECIAL_DBUS_SOCKET ": %m");<br>
> +<br>
> + /* Regardless if kdbus is used or not, we always want to be ordered against dbus.socket if both are in the transaction. */<br>
> + r = unit_add_dependency_by_name(<wbr>UNIT(s), UNIT_AFTER, SPECIAL_DBUS_SOCKET, NULL, true);<br>
> +Index: git/src/dbus1-generator/dbus1-<wbr>generator.c<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/src/dbus1-generator/<wbr>dbus1-generator.c<br>
> ++++ /dev/null<br>
> +@@ -1,331 +0,0 @@<br>
> +-/***<br>
> +- This file is part of systemd.<br>
> +-<br>
> +- Copyright 2013 Lennart Poettering<br>
> +-<br>
> +- systemd is free software; you can redistribute it and/or modify it<br>
> +- under the terms of the GNU Lesser General Public License as published by<br>
> +- the Free Software Foundation; either version 2.1 of the License, or<br>
> +- (at your option) any later version.<br>
> +-<br>
> +- systemd is distributed in the hope that it will be useful, but<br>
> +- WITHOUT ANY WARRANTY; without even the implied warranty of<br>
> +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU<br>
> +- Lesser General Public License for more details.<br>
> +-<br>
> +- You should have received a copy of the GNU Lesser General Public License<br>
> +- along with systemd; If not, see <<a href="http://www.gnu.org/licenses/" rel="noreferrer" target="_blank">http://www.gnu.org/licenses/</a>><wbr>.<br>
> +-***/<br>
> +-<br>
> +-#include "alloc-util.h"<br>
> +-#include "bus-internal.h"<br>
> +-#include "bus-util.h"<br>
> +-#include "cgroup-util.h"<br>
> +-#include "conf-parser.h"<br>
> +-#include "dirent-util.h"<br>
> +-#include "fd-util.h"<br>
> +-#include "fileio.h"<br>
> +-#include "mkdir.h"<br>
> +-#include "special.h"<br>
> +-#include "unit-name.h"<br>
> +-#include "util.h"<br>
> +-<br>
> +-static const char *arg_dest_late = "/tmp", *arg_dest = "/tmp";<br>
> +-<br>
> +-static int create_dbus_files(<br>
> +- const char *path,<br>
> +- const char *name,<br>
> +- const char *service,<br>
> +- const char *exec,<br>
> +- const char *user,<br>
> +- const char *type) {<br>
> +-<br>
> +- _cleanup_free_ char *b = NULL, *s = NULL, *lnk = NULL;<br>
> +- _cleanup_fclose_ FILE *f = NULL;<br>
> +- int r;<br>
> +-<br>
> +- assert(path);<br>
> +- assert(name);<br>
> +- assert(service || exec);<br>
> +-<br>
> +- if (!service) {<br>
> +- _cleanup_free_ char *a = NULL;<br>
> +-<br>
> +- s = strjoin("dbus-", name, ".service", NULL);<br>
> +- if (!s)<br>
> +- return log_oom();<br>
> +-<br>
> +- a = strjoin(arg_dest_late, "/", s, NULL);<br>
> +- if (!a)<br>
> +- return log_oom();<br>
> +-<br>
> +- f = fopen(a, "wxe");<br>
> +- if (!f)<br>
> +- return log_error_errno(errno, "Failed to create %s: %m", a);<br>
> +-<br>
> +- fprintf(f,<br>
> +- "# Automatically generated by systemd-dbus1-generator\n\n"<br>
> +- "[Unit]\n"<br>
> +- "SourcePath=%s\n"<br>
> +- "Description=DBUS1: %s\n"<br>
> +- "Documentation=man:systemd-<wbr>dbus1-generator(8)\n\n"<br>
> +- "[Service]\n"<br>
> +- "ExecStart=%s\n"<br>
> +- "Type=dbus\n"<br>
> +- "BusName=%s\n",<br>
> +- path,<br>
> +- name,<br>
> +- exec,<br>
> +- name);<br>
> +-<br>
> +- if (user)<br>
> +- fprintf(f, "User=%s\n", user);<br>
> +-<br>
> +-<br>
> +- if (type) {<br>
> +- fprintf(f, "Environment=DBUS_STARTER_BUS_<wbr>TYPE=%s\n", type);<br>
> +-<br>
> +- if (streq(type, "system"))<br>
> +- fprintf(f, "Environment=DBUS_STARTER_<wbr>ADDRESS=" DEFAULT_SYSTEM_BUS_ADDRESS "\n");<br>
> +- else if (streq(type, "session")) {<br>
> +- char *run;<br>
> +-<br>
> +- run = getenv("XDG_RUNTIME_DIR");<br>
> +- if (!run) {<br>
> +- log_error("XDG_RUNTIME_DIR not set.");<br>
> +- return -EINVAL;<br>
> +- }<br>
> +-<br>
> +- fprintf(f, "Environment=DBUS_STARTER_<wbr>ADDRESS="KERNEL_USER_BUS_<wbr>ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT "\n",<br>
> +- getuid(), run);<br>
> +- }<br>
> +- }<br>
> +-<br>
> +- r = fflush_and_check(f);<br>
> +- if (r < 0)<br>
> +- return log_error_errno(r, "Failed to write %s: %m", a);<br>
> +-<br>
> +- f = safe_fclose(f);<br>
> +-<br>
> +- service = s;<br>
> +- }<br>
> +-<br>
> +- b = strjoin(arg_dest_late, "/", name, ".busname", NULL);<br>
> +- if (!b)<br>
> +- return log_oom();<br>
> +-<br>
> +- f = fopen(b, "wxe");<br>
> +- if (!f)<br>
> +- return log_error_errno(errno, "Failed to create %s: %m", b);<br>
> +-<br>
> +- fprintf(f,<br>
> +- "# Automatically generated by systemd-dbus1-generator\n\n"<br>
> +- "[Unit]\n"<br>
> +- "SourcePath=%s\n"<br>
> +- "Description=DBUS1: %s\n"<br>
> +- "Documentation=man:systemd-<wbr>dbus1-generator(8)\n\n"<br>
> +- "[BusName]\n"<br>
> +- "Name=%s\n"<br>
> +- "Service=%s\n"<br>
> +- "AllowWorld=talk\n",<br>
> +- path,<br>
> +- name,<br>
> +- name,<br>
> +- service);<br>
> +-<br>
> +- r = fflush_and_check(f);<br>
> +- if (r < 0)<br>
> +- return log_error_errno(r, "Failed to write %s: %m", b);<br>
> +-<br>
> +- lnk = strjoin(arg_dest_late, "/" SPECIAL_BUSNAMES_TARGET ".wants/", name, ".busname", NULL);<br>
> +- if (!lnk)<br>
> +- return log_oom();<br>
> +-<br>
> +- mkdir_parents_label(lnk, 0755);<br>
> +- if (symlink(b, lnk))<br>
> +- return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);<br>
> +-<br>
> +- return 0;<br>
> +-}<br>
> +-<br>
> +-static int add_dbus(const char *path, const char *fname, const char *type) {<br>
> +- _cleanup_free_ char *name = NULL, *exec = NULL, *user = NULL, *service = NULL;<br>
> +-<br>
> +- const ConfigTableItem table[] = {<br>
> +- { "D-BUS Service", "Name", config_parse_string, 0, &name },<br>
> +- { "D-BUS Service", "Exec", config_parse_string, 0, &exec },<br>
> +- { "D-BUS Service", "User", config_parse_string, 0, &user },<br>
> +- { "D-BUS Service", "SystemdService", config_parse_string, 0, &service },<br>
> +- { },<br>
> +- };<br>
> +-<br>
> +- char *p;<br>
> +- int r;<br>
> +-<br>
> +- assert(path);<br>
> +- assert(fname);<br>
> +-<br>
> +- p = strjoina(path, "/", fname);<br>
> +- r = config_parse(NULL, p, NULL,<br>
> +- "D-BUS Service\0",<br>
> +- config_item_table_lookup, table,<br>
> +- true, false, true, NULL);<br>
> +- if (r < 0)<br>
> +- return r;<br>
> +-<br>
> +- if (!name) {<br>
> +- log_warning("Activation file %s lacks name setting, ignoring.", p);<br>
> +- return 0;<br>
> +- }<br>
> +-<br>
> +- if (!service_name_is_valid(name)) {<br>
> +- log_warning("Bus service name %s is not valid, ignoring.", name);<br>
> +- return 0;<br>
> +- }<br>
> +-<br>
> +- if (streq(name, "org.freedesktop.systemd1")) {<br>
> +- log_debug("Skipping %s, identified as systemd.", p);<br>
> +- return 0;<br>
> +- }<br>
> +-<br>
> +- if (service) {<br>
> +- if (!unit_name_is_valid(service, UNIT_NAME_PLAIN|UNIT_NAME_<wbr>INSTANCE)) {<br>
> +- log_warning("Unit name %s is not valid, ignoring.", service);<br>
> +- return 0;<br>
> +- }<br>
> +- if (!endswith(service, ".service")) {<br>
> +- log_warning("Bus names can only activate services, ignoring %s.", p);<br>
> +- return 0;<br>
> +- }<br>
> +- } else {<br>
> +- if (streq(exec, "/bin/false") || !exec) {<br>
> +- log_warning("Neither service name nor binary path specified, ignoring %s.", p);<br>
> +- return 0;<br>
> +- }<br>
> +-<br>
> +- if (exec[0] != '/') {<br>
> +- log_warning("Exec= in %s does not start with an absolute path, ignoring.", p);<br>
> +- return 0;<br>
> +- }<br>
> +- }<br>
> +-<br>
> +- return create_dbus_files(p, name, service, exec, user, type);<br>
> +-}<br>
> +-<br>
> +-static int parse_dbus_fragments(const char *path, const char *type) {<br>
> +- _cleanup_closedir_ DIR *d = NULL;<br>
> +- struct dirent *de;<br>
> +- int r;<br>
> +-<br>
> +- assert(path);<br>
> +- assert(type);<br>
> +-<br>
> +- d = opendir(path);<br>
> +- if (!d) {<br>
> +- if (errno == -ENOENT)<br>
> +- return 0;<br>
> +-<br>
> +- return log_error_errno(errno, "Failed to enumerate D-Bus activated services: %m");<br>
> +- }<br>
> +-<br>
> +- r = 0;<br>
> +- FOREACH_DIRENT(de, d, goto fail) {<br>
> +- int q;<br>
> +-<br>
> +- if (!endswith(de->d_name, ".service"))<br>
> +- continue;<br>
> +-<br>
> +- q = add_dbus(path, de->d_name, type);<br>
> +- if (q < 0)<br>
> +- r = q;<br>
> +- }<br>
> +-<br>
> +- return r;<br>
> +-<br>
> +-fail:<br>
> +- return log_error_errno(errno, "Failed to read D-Bus services directory: %m");<br>
> +-}<br>
> +-<br>
> +-static int link_busnames_target(const char *units) {<br>
> +- const char *f, *t;<br>
> +-<br>
> +- f = strjoina(units, "/" SPECIAL_BUSNAMES_TARGET);<br>
> +- t = strjoina(arg_dest, "/" SPECIAL_BASIC_TARGET ".wants/" SPECIAL_BUSNAMES_TARGET);<br>
> +-<br>
> +- mkdir_parents_label(t, 0755);<br>
> +- if (symlink(f, t) < 0)<br>
> +- return log_error_errno(errno, "Failed to create symlink %s: %m", t);<br>
> +-<br>
> +- return 0;<br>
> +-}<br>
> +-<br>
> +-static int link_compatibility(const char *units) {<br>
> +- const char *f, *t;<br>
> +-<br>
> +- f = strjoina(units, "/systemd-bus-proxyd.socket");<br>
> +- t = strjoina(arg_dest, "/" SPECIAL_DBUS_SOCKET);<br>
> +- mkdir_parents_label(t, 0755);<br>
> +- if (symlink(f, t) < 0)<br>
> +- return log_error_errno(errno, "Failed to create symlink %s: %m", t);<br>
> +-<br>
> +- f = strjoina(units, "/systemd-bus-proxyd.socket");<br>
> +- t = strjoina(arg_dest, "/" SPECIAL_SOCKETS_TARGET ".wants/systemd-bus-proxyd.<wbr>socket");<br>
> +- mkdir_parents_label(t, 0755);<br>
> +- if (symlink(f, t) < 0)<br>
> +- return log_error_errno(errno, "Failed to create symlink %s: %m", t);<br>
> +-<br>
> +- t = strjoina(arg_dest, "/" SPECIAL_DBUS_SERVICE);<br>
> +- if (symlink("/dev/null", t) < 0)<br>
> +- return log_error_errno(errno, "Failed to mask %s: %m", t);<br>
> +-<br>
> +- return 0;<br>
> +-}<br>
> +-<br>
> +-int main(int argc, char *argv[]) {<br>
> +- const char *path, *type, *units;<br>
> +- int r, q;<br>
> +-<br>
> +- if (argc > 1 && argc != 4) {<br>
> +- log_error("This program takes three or no arguments.");<br>
> +- return EXIT_FAILURE;<br>
> +- }<br>
> +-<br>
> +- if (argc > 1) {<br>
> +- arg_dest = argv[1];<br>
> +- arg_dest_late = argv[3];<br>
> +- }<br>
> +-<br>
> +- log_set_target(LOG_TARGET_<wbr>SAFE);<br>
> +- log_parse_environment();<br>
> +- log_open();<br>
> +-<br>
> +- umask(0022);<br>
> +-<br>
> +- if (!is_kdbus_available())<br>
> +- return 0;<br>
> +-<br>
> +- r = cg_pid_get_owner_uid(0, NULL);<br>
> +- if (r >= 0) {<br>
> +- path = "/usr/share/dbus-1/services";<br>
> +- type = "session";<br>
> +- units = USER_DATA_UNIT_PATH;<br>
> +- } else if (r == -ENXIO) {<br>
> +- path = "/usr/share/dbus-1/system-<wbr>services";<br>
> +- type = "system";<br>
> +- units = SYSTEM_DATA_UNIT_PATH;<br>
> +- } else<br>
> +- return log_error_errno(r, "Failed to determine whether we are running as user or system instance: %m");<br>
> +-<br>
> +- r = parse_dbus_fragments(path, type);<br>
> +-<br>
> +- /* FIXME: One day this should just be pulled in statically from basic.target */<br>
> +- q = link_busnames_target(units);<br>
> +- if (q < 0)<br>
> +- r = q;<br>
> +-<br>
> +- q = link_compatibility(units);<br>
> +- if (q < 0)<br>
> +- r = q;<br>
> +-<br>
> +- return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;<br>
> +-}<br>
> +Index: git/src/login/pam_systemd.c<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/src/login/pam_<wbr>systemd.c<br>
> ++++ git/src/login/pam_systemd.c<br>
> +@@ -182,25 +182,20 @@ static int export_legacy_dbus_address(<br>
> + _cleanup_free_ char *s = NULL;<br>
> + int r = PAM_BUF_ERR;<br>
> +<br>
> +- if (is_kdbus_available()) {<br>
> +- if (asprintf(&s, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, uid, runtime) < 0)<br>
> +- goto error;<br>
> +- } else {<br>
> +- /* FIXME: We *really* should move the access() check into the<br>
> +- * daemons that spawn dbus-daemon, instead of forcing<br>
> +- * DBUS_SESSION_BUS_ADDRESS= here. */<br>
> ++ /* FIXME: We *really* should move the access() check into the<br>
> ++ * daemons that spawn dbus-daemon, instead of forcing<br>
> ++ * DBUS_SESSION_BUS_ADDRESS= here. */<br>
> +<br>
> +- s = strjoin(runtime, "/bus", NULL);<br>
> +- if (!s)<br>
> +- goto error;<br>
> ++ s = strjoin(runtime, "/bus", NULL);<br>
> ++ if (!s)<br>
> ++ goto error;<br>
> +<br>
> +- if (access(s, F_OK) < 0)<br>
> +- return PAM_SUCCESS;<br>
> ++ if (access(s, F_OK) < 0)<br>
> ++ return PAM_SUCCESS;<br>
> +<br>
> +- s = mfree(s);<br>
> +- if (asprintf(&s, UNIX_USER_BUS_ADDRESS_FMT, runtime) < 0)<br>
> +- goto error;<br>
> +- }<br>
> ++ s = mfree(s);<br>
> ++ if (asprintf(&s, UNIX_USER_BUS_ADDRESS_FMT, runtime) < 0)<br>
> ++ goto error;<br>
> +<br>
> + r = pam_misc_setenv(handle, "DBUS_SESSION_BUS_ADDRESS", s, 0);<br>
> + if (r != PAM_SUCCESS)<br>
> +Index: git/src/shared/bus-util.c<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/src/shared/bus-util.c<br>
> ++++ git/src/shared/bus-util.c<br>
> +@@ -1492,40 +1492,6 @@ int bus_path_decode_unique(const char *p<br>
> + return 1;<br>
> + }<br>
> +<br>
> +-bool is_kdbus_wanted(void) {<br>
> +- _cleanup_free_ char *value = NULL;<br>
> +-#ifdef ENABLE_KDBUS<br>
> +- const bool configured = true;<br>
> +-#else<br>
> +- const bool configured = false;<br>
> +-#endif<br>
> +-<br>
> +- int r;<br>
> +-<br>
> +- if (get_proc_cmdline_key("kdbus", NULL) > 0)<br>
> +- return true;<br>
> +-<br>
> +- r = get_proc_cmdline_key("kdbus=", &value);<br>
> +- if (r <= 0)<br>
> +- return configured;<br>
> +-<br>
> +- return parse_boolean(value) == 1;<br>
> +-}<br>
> +-<br>
> +-bool is_kdbus_available(void) {<br>
> +- _cleanup_close_ int fd = -1;<br>
> +- struct kdbus_cmd cmd = { .size = sizeof(cmd), .flags = KDBUS_FLAG_NEGOTIATE };<br>
> +-<br>
> +- if (!is_kdbus_wanted())<br>
> +- return false;<br>
> +-<br>
> +- fd = open("/sys/fs/kdbus/control", O_RDWR | O_CLOEXEC | O_NONBLOCK | O_NOCTTY);<br>
> +- if (fd < 0)<br>
> +- return false;<br>
> +-<br>
> +- return ioctl(fd, KDBUS_CMD_BUS_MAKE, &cmd) >= 0;<br>
> +-}<br>
> +-<br>
> + int bus_property_get_rlimit(<br>
> + sd_bus *bus,<br>
> + const char *path,<br>
> +Index: git/src/shared/bus-util.h<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/src/shared/bus-util.h<br>
> ++++ git/src/shared/bus-util.h<br>
> +@@ -157,7 +157,4 @@ int bus_log_create_error(int r);<br>
> + int bus_path_encode_unique(sd_bus *b, const char *prefix, const char *sender_id, const char *external_id, char **ret_path);<br>
> + int bus_path_decode_unique(const char *path, const char *prefix, char **ret_sender, char **ret_external);<br>
> +<br>
> +-bool is_kdbus_wanted(void);<br>
> +-bool is_kdbus_available(void);<br>
> +-<br>
> + int bus_property_get_rlimit(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);<br>
> +Index: git/Makefile.am<br>
> +=============================<wbr>==============================<wbr>========<br>
> +--- git.orig/Makefile.am<br>
> ++++ git/Makefile.am<br>
> +@@ -2895,29 +2895,9 @@ systemd_gpt_auto_generator_<wbr>CFLAGS = \<br>
> + endif<br>
> +<br>
> + # ------------------------------<wbr>------------------------------<wbr>------------------<br>
> +-systemgenerator_PROGRAMS += \<br>
> +- systemd-dbus1-generator<br>
> +-<br>
> +-systemd_dbus1_generator_<wbr>SOURCES = \<br>
> +- src/dbus1-generator/dbus1-<wbr>generator.c<br>
> +-<br>
> +-systemd_dbus1_generator_<wbr>LDADD = \<br>
> +- <a href="http://libshared.la" rel="noreferrer" target="_blank">libshared.la</a><br>
> +-<br>
> +-dbus1-generator-install-<wbr>hook:<br>
> +- $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)<br>
> +- $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/<wbr>systemd-dbus1-generator<br>
> +- $(AM_V_LN)lnr $(DESTDIR)$(<wbr>systemgeneratordir)/systemd-<wbr>dbus1-generator $(DESTDIR)$(usergeneratordir)/<wbr>systemd-dbus1-generator<br>
> +-<br>
> +-dbus1-generator-uninstall-<wbr>hook:<br>
> +- rm -f $(DESTDIR)$(usergeneratordir)/<wbr>systemd-dbus1-generator<br>
> +-<br>
> + dist_xinitrc_SCRIPTS = \<br>
> + xorg/50-systemd-user.sh<br>
> +<br>
> +-INSTALL_EXEC_HOOKS += dbus1-generator-install-hook<br>
> +-UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook<br>
> +-<br>
> + # ------------------------------<wbr>------------------------------<wbr>------------------<br>
> + systemd_sysv_generator_SOURCES = \<br>
> + src/sysv-generator/sysv-<wbr>generator.c<br>
> diff --git a/meta/recipes-core/systemd/<a href="http://systemd_230.bb" rel="noreferrer" target="_blank">sy<wbr>stemd_230.bb</a> b/meta/recipes-core/systemd/<a href="http://systemd_230.bb" rel="noreferrer" target="_blank">sy<wbr>stemd_230.bb</a><br>
> index 40f1428..f4ff860 100644<br>
> --- a/meta/recipes-core/systemd/<a href="http://systemd_230.bb" rel="noreferrer" target="_blank">sy<wbr>stemd_230.bb</a><br>
> +++ b/meta/recipes-core/systemd/<a href="http://systemd_230.bb" rel="noreferrer" target="_blank">sy<wbr>stemd_230.bb</a><br>
> @@ -37,6 +37,7 @@ SRC_URI += " \<br>
> file://udev-re-enable-mount-<wbr>propagation-for-udevd.patch \<br>
> file://CVE-2016-7795.patch \<br>
> file://validate-user.patch \<br>
> + file://Ensure-kdbus-isn-t-<wbr>used-3501.patch \<br>
> "<br>
> SRC_URI_append_libc-uclibc = "\<br>
> file://0002-units-Prefer-<wbr>getty-to-agetty-in-console-<wbr>setup-system.patch \<br>
> @@ -61,7 +62,6 @@ PACKAGECONFIG ??= "xz \<br>
> timedated \<br>
> timesyncd \<br>
> localed \<br>
> - kdbus \<br>
> ima \<br>
> smack \<br>
> logind \<br>
> @@ -96,7 +96,6 @@ PACKAGECONFIG[timedated] = "--enable-timedated,--disable-<wbr>timedated"<br>
> PACKAGECONFIG[timesyncd] = "--enable-timesyncd,--disable-<wbr>timesyncd"<br>
> PACKAGECONFIG[localed] = "--enable-localed,--disable-<wbr>localed"<br>
> PACKAGECONFIG[efi] = "--enable-efi,--disable-efi"<br>
> -PACKAGECONFIG[kdbus] = "--enable-kdbus,--disable-<wbr>kdbus"<br>
> PACKAGECONFIG[ima] = "--enable-ima,--disable-ima"<br>
> PACKAGECONFIG[smack] = "--enable-smack,--disable-<wbr>smack"<br>
> # libseccomp is found in meta-security<br>
> --<br>
> 2.7.4<br>
><br>
</div></div><span class="gmail-HOEnZb"><font color="#888888">> --<br>
> ______________________________<wbr>_________________<br>
> Openembedded-core mailing list<br>
> <a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div></div></div></div></div>