Skip to content

perf: optimize systemd services startup and cleanup dependencies #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yixinshark wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −19
Open

perf: optimize systemd services startup and cleanup dependencies #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion systemd/dde-session-core.target.wants/dde-shell-plugin@org.deepin.ds.desktop.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ Requires=dbus.socket
After=dbus.socket

[Service]
Type=simple
Type=dbus
BusName=com.deepin.dde.desktop
ExecStart=/usr/bin/dde-shell -p %I
TimeoutStartSec=infinity
Slice=session.slice
Expand Down
14 changes: 3 additions & 11 deletions systemd/dde-session-core.target.wants/dde-shell@DDE.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,12 @@ Before=dde-session-core.target
Requires=dbus.socket
After=dbus.socket

#FIXME: maybe AM is invalid
# old AM
Wants=org.deepin.dde.Application1.Manager.service
After=org.deepin.dde.Application1.Manager.service
# new AM
# AM
Wants=org.desktopspec.ApplicationManager1.service
After=org.desktopspec.ApplicationManager1.service

# No longer needed. Just a dependency of some of dde-shell's plugins.
# Wants=org.dde.session.Daemon1.service
# After=org.dde.session.Daemon1.service

[Service]
Type=simple
Type=dbus
BusName=org.deepin.dde.Dock1
ExecStart=/usr/bin/dde-shell -C %I --serviceName=org.deepin.dde.shell -d org.deepin.ds.desktop
TimeoutStartSec=infinity
Slice=session.slice
Expand Down
10 changes: 3 additions & 7 deletions systemd/dde-session-pre.target.wants/dde-session@x11.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[Unit]
Description=dde on X11
CollectMode=inactive-or-failed
# Only start if the template instance matches the session type (systemd >= 246)
ConditionEnvironment=XDG_SESSION_TYPE=%I

PartOf=dde-session-pre.target
Before=dde-session-pre.target
Expand All @@ -12,13 +14,7 @@ StartLimitBurst=3
[Service]
Slice=session.slice
Type=notify
# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in
# the [Unit] section with systemd >= 246. Also, the current solution is
# kind of painful as systemd had a bug where it retries the condition.
# Only start if the template instance matches the session type.
ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
ExecStartPre=-/bin/sh -c 'cp -n /etc/xdg/kglobalshortcutsrc $HOME/.config/kglobalshortcutsrc'
ExecStartPre=-/bin/sh -c 'sed -i "s/deepin-kwin/kwin/g" $HOME/.config/kglobalshortcutsrc'
ExecStartPre=-/bin/sh -c 'cp -n /etc/xdg/kglobalshortcutsrc "$HOME/.config/kglobalshortcutsrc"; sed -i "s/deepin-kwin/kwin/g" "$HOME/.config/kglobalshortcutsrc"'
ExecStart=/usr/bin/kwin_x11 --replace
# Exit code 1 means we are probably *not* dealing with an extension failure
SuccessExitStatus=1
Expand Down
Loading