From 25cf068b63698b79091592041cc57412a6d09ea8 Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Fri, 17 Feb 2017 00:38:00 +0900 Subject: [PATCH] kdbus: mask dbus.socket Signed-off-by: INSUN PYO Change-Id: Id168043bfe80c9e6c177b526c5bcae6475561096 --- packaging/systemd.spec | 8 -------- src/dbus1-generator/dbus1-generator.c | 18 +++++------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/packaging/systemd.spec b/packaging/systemd.spec index 73be1f8..3d96b3d 100755 --- a/packaging/systemd.spec +++ b/packaging/systemd.spec @@ -259,14 +259,6 @@ rm -rf %{buildroot}/%{_prefix}/lib/systemd/system/sysinit.target.wants/systemd-m rm -rf %{buildroot}/%{_prefix}/lib/systemd/system/sysinit.target.wants/systemd-ask-password-console.path rm -rf %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/systemd-ask-password-wall.path -# Disable systemd-bus-proxyd -%if %{with kdbus} -rm -Rf %{buildroot}/%{_prefix}/lib/systemd/system/systemd-bus-proxyd.socket -rm -Rf %{buildroot}/%{_prefix}/lib/systemd/system/systemd-bus-proxyd.service -rm -Rf %{buildroot}/%{_prefix}/lib/systemd/user/systemd-bus-proxyd.socket -rm -Rf %{buildroot}/%{_prefix}/lib/systemd/user/systemd-bus-proxyd.service -%endif - # Move macros to the proper location for Tizen mkdir -p %{buildroot}%{_sysconfdir}/rpm install -m644 src/core/macros.systemd %{buildroot}%{_sysconfdir}/rpm/macros.systemd diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c index 717cb95..ca380d2 100755 --- a/src/dbus1-generator/dbus1-generator.c +++ b/src/dbus1-generator/dbus1-generator.c @@ -260,24 +260,16 @@ static int link_busnames_target(const char *units) { } static int link_compatibility(const char *units) { - const char *f, *t; - - f = strjoina(units, "/systemd-bus-proxyd.socket"); - t = strjoina(arg_dest, "/" SPECIAL_DBUS_SOCKET); - mkdir_parents_label(t, 0755); - if (symlink(f, t) < 0) - return log_error_errno(errno, "Failed to create symlink %s: %m", t); - - f = strjoina(units, "/systemd-bus-proxyd.socket"); - t = strjoina(arg_dest, "/" SPECIAL_SOCKETS_TARGET ".wants/systemd-bus-proxyd.socket"); - mkdir_parents_label(t, 0755); - if (symlink(f, t) < 0) - return log_error_errno(errno, "Failed to create symlink %s: %m", t); + const char *t; t = strjoina(arg_dest, "/" SPECIAL_DBUS_SERVICE); if (symlink("/dev/null", t) < 0) return log_error_errno(errno, "Failed to mask %s: %m", t); + t = strjoina(arg_dest, "/" SPECIAL_DBUS_SOCKET); + if (symlink("/dev/null", t) < 0) + return log_error_errno(errno, "Failed to mask %s: %m", t); + return 0; } -- 2.7.4