From 07d719ddee2a267775aaa81b9810ae1e45cf12f5 Mon Sep 17 00:00:00 2001 From: Geunsik Lim Date: Thu, 8 May 2014 08:34:38 +0900 Subject: [PATCH] Remove the redundant out-of-date dbus.socket symlink Previously, Lennart Poettering submitted two dbus.socket files for Systemd on Jul-09-2010 as follows. * title: systemd: install systemd socket and service file by default * patches: http://cgit.freedesktop.org/dbus/dbus/commit/? id=bffc52a38536dfe400a6b5219ee44465c9b817b9 ) Recently, i checked two dbus.socket symlinks at /usr/lib/systemd/system/ from fedora 20. fedora20#> find /usr/lib/systemd/system -name dbus.socket /usr/lib/systemd/system/dbus.socket /usr/lib/systemd/system/dbus.target.wants/dbus.socket (*) --> We don't need this directory including the dbus.socket (symlink file) /usr/lib/systemd/system/sockets.target.wants/dbus.socket There same two symbolic files redundantly in /lib/systemd/system/ folder. Systemd supports /usr/lib/systemd/system/sockets.target.wants/ to manage socket files is called *.socket. Actually, we don't need "/lib/systemd/system/dbus.target.wants/" directory including the dbus.socket (symlink file). Above all, there are not "dbus.target" file in "/lib/systemd/system/" directory for /usr/lib/systemd/system/dbus.target.wants/ rule. Let's remove unnecessary ./dbus.target.wants/ folder including dbus.socket Signed-off-by: Geunsik Lim Signed-off-by: MyungJoo Ham Signed-off-by: Jae-young Hwang Cc: Lennart Poettering --- bus/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bus/Makefile.am b/bus/Makefile.am index f335e30..62fe911 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -208,13 +208,11 @@ install-data-hook: $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services + if HAVE_SYSTEMD # Install dbus.socket as default implementation of a D-Bus stack. # Deliberately not using $(LN_S) here: ln -fs is not universally portable, # but neither is systemd, so it's OK to assume here that ln complies with SUS. - $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants - ln -fs ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket -# Unconditionally enable D-Bus on systemd installations $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants ln -fs ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants -- 1.7.9.5