SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus: always create --user bus when kdbus is active

Browse Source 
We set the variable in the unit file for --user, so this check is
always true.
This commit is contained in:
Kay Sievers
2014-01-03 02:59:05 +01:00
parent ff25413852
commit 88c59cb3c1
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/manager.c
+2 -5
View File
@@ -538,10 +538,6 @@ static int manager_setup_kdbus(Manager *m) {
if (m->kdbus_fd >= 0)
return 0;
/* If there's already a bus address set, don't set up kdbus */
if (m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS"))
return 0;
m->kdbus_fd = bus_kernel_create_bus(m->running_as == SYSTEMD_SYSTEM ? "system" : "user", m->running_as == SYSTEMD_SYSTEM, &p);
if (m->kdbus_fd < 0) {
log_debug("Failed to set up kdbus: %s", strerror(-m->kdbus_fd));
@@ -554,7 +550,8 @@ static int manager_setup_kdbus(Manager *m) {
* of that directory is not visible to non-root users. This is
* necessary to ensure that users cannot get access to busses
* of virtualized users when no UID namespacing is used. */
mkdir_p_label("/dev/kdbus/ns", 0700);
if (m->running_as == SYSTEMD_SYSTEM)
mkdir_p_label("/dev/kdbus/ns", 0700);
#endif
return 0;