From fb865c86da23c7eb83e81ebd510dfe423c0b543c Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Mon, 3 Nov 2014 18:33:52 +0100 Subject: [PATCH] Set DBUS_SESSION_BUS_ADDRESS directly on services Rather than from environment configuration file so that systemd will expand %t. --- packaging/plasma-phone-components.spec | 2 -- services/plasma-phone-compositor.service.cmake | 1 + services/plasma-phone-ui.service.cmake | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/plasma-phone-components.spec b/packaging/plasma-phone-components.spec index 4f0e5bb3..1a0d7705 100644 --- a/packaging/plasma-phone-components.spec +++ b/packaging/plasma-phone-components.spec @@ -86,8 +86,6 @@ cat > %{buildroot}%{_sharedstatedir}/environment/plasma-phone/plasma-phone.conf LIBEXEC_PATH="%{_libexecdir}:%{_libdir}/libexec:%{_kf5_libexecdir}" QT_PLUGIN_PATH=\${QT_PLUGIN_PATH+\$QT_PLUGIN_PATH:}\`qtpaths --plugin-dir\`:%{_libdir}/kde5/plugins -DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket - QT_QPA_PLATFORM=wayland QT_QPA_PLATFORMTHEME=KDE QT_WAYLAND_DISABLE_WINDOWDECORATION=1 diff --git a/services/plasma-phone-compositor.service.cmake b/services/plasma-phone-compositor.service.cmake index 0a9aa512..aa886a13 100644 --- a/services/plasma-phone-compositor.service.cmake +++ b/services/plasma-phone-compositor.service.cmake @@ -12,6 +12,7 @@ Conflicts=maui-bootsplash.service [Service] Type=notify +Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket EnvironmentFile=-/var/lib/environment/compositor/*.conf EnvironmentFile=-/var/lib/environment/greenisland/*.conf ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone diff --git a/services/plasma-phone-ui.service.cmake b/services/plasma-phone-ui.service.cmake index 4fce3992..028a43a5 100644 --- a/services/plasma-phone-ui.service.cmake +++ b/services/plasma-phone-ui.service.cmake @@ -9,6 +9,7 @@ Description=Plasma Phone UI Requires=dbus.socket plasma-phone-compositor.service [Service] +Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasma-phone ExecStop=@CMAKE_INSTALL_FULL_BINDIR@/kquitapp5 plasmashell