diff options
| author | Yunmi Ha <yunmi.ha@samsung.com> | 2019-08-20 08:09:07 +0000 |
|---|---|---|
| committer | Hyotaek Shim <hyotaek.shim@samsung.com> | 2019-08-20 09:04:24 +0000 |
| commit | 2faa8c09421e5b2b9562c1536a173827861c42a5 (patch) | |
| tree | 0745fbd895f97cd2183f6d1700a171cc5f81fc4d /bus | |
| parent | 4911ed550dd3db381545eead47aa9a4b7f1492c7 (diff) | |
| download | dbus-2faa8c09421e5b2b9562c1536a173827861c42a5.tar.gz dbus-2faa8c09421e5b2b9562c1536a173827861c42a5.tar.bz2 dbus-2faa8c09421e5b2b9562c1536a173827861c42a5.zip | |
Revert "tizen: Add additional unit for "unified" user session"tizen_5.5.m2_releasesubmit/tizen_5.5_mobile_hotfix/20201026.185106submit/tizen_5.5/20191031.000006submit/tizen/20190820.090809accepted/tizen/unified/20190822.045457accepted/tizen/5.5/unified/mobile/hotfix/20201027.063100accepted/tizen/5.5/unified/20191031.005930tizen_5.5_tvtizen_5.5_mobile_hotfixaccepted/tizen_5.5_unified_mobile_hotfix
This reverts commit 662187a7597aaf9c9ad2a635944951e6174a36da.
We've optimized systemd-user without unified system/session.
So, we revert the patch for unified system/session.
Change-Id: I70ee37ebeda65e549c5f544d37d511cb6d54b757
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/Makefile.am | 9 | ||||
| -rw-r--r-- | bus/systemd-system/dbus@.service.in | 17 | ||||
| -rw-r--r-- | bus/systemd-system/dbus@.socket.in | 12 |
3 files changed, 1 insertions, 37 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index 6558ee14..5f28a25f 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -264,9 +264,6 @@ endif if DBUS_ENABLE_USER_SESSION $(mkinstalldirs) $(DESTDIR)$(systemduserunitdir)/sockets.target.wants ln -fs ../dbus.socket $(DESTDIR)$(systemduserunitdir)/sockets.target.wants/dbus.socket - - $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/user-sockets@.target.wants - ln -fs ../dbus@.socket $(DESTDIR)$(systemdsystemunitdir)/user-sockets@.target.wants/dbus@.socket endif if DBUS_UNIX @@ -322,15 +319,11 @@ SCRIPT_IN_FILES += \ dbus.socket.in \ systemd-user/dbus.service.in \ systemd-user/dbus.socket.in \ - systemd-system/dbus@.service.in \ - systemd-system/dbus@.socket.in \ $(NULL) systemdsystemunit_DATA = \ dbus.service \ - dbus.socket \ - systemd-system/dbus@.service \ - systemd-system/dbus@.socket + dbus.socket endif if DBUS_ENABLE_USER_SESSION diff --git a/bus/systemd-system/dbus@.service.in b/bus/systemd-system/dbus@.service.in deleted file mode 100644 index e19b4435..00000000 --- a/bus/systemd-system/dbus@.service.in +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -PartOf=userlogin@%i.target -Description=D-Bus User Message Bus -Documentation=man:dbus-daemon(1) -DefaultDependencies=no -Requires=dbus@%i.socket - -[Service] -User=%i -Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/sys/fs/kdbus/%i-user/bus;unix:path=/run/user/%i/bus -Environment=XDG_RUNTIME_DIR=/run/user/%i -SmackProcessLabel=User -ExecStart=@EXPANDED_BINDIR@/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation -ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig - -[Install] -Also=dbus@.socket diff --git a/bus/systemd-system/dbus@.socket.in b/bus/systemd-system/dbus@.socket.in deleted file mode 100644 index 0684b28d..00000000 --- a/bus/systemd-system/dbus@.socket.in +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -PartOf=userlogin@%i.target -DefaultDependencies=no -After=systemd-logind.service -Description=D-Bus User Message Bus Socket - -[Socket] -SocketUser=%i -ListenStream=/run/user/%i/bus - -[Install] -Also=dbus.service |