Skip to content

Commit 0af841f

Browse files
yixinsharkyixinshark
committed
refactor: reorganize systemd target dependencies and introduce core target
- Added a new `dde-session-core.target` to manage core desktop components. - Updated dependencies for `dde-session-initialized.target` to require `dde-session-core.target`. - Adjusted service installation paths and symlinks to reflect the new target structure. - Removed the obsolete `dde-session-manager.target` to streamline the service management process. - Enhanced the configuration of existing services to align with the new target hierarchy. Log: as title
1 parent 209d9d5 commit 0af841f

14 files changed

Lines changed: 42 additions & 52 deletions

‎systemd/CMakeLists.txt‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ configure_file(dde-session-shutdown.service.in
1111
set(SERVICES
1212
dde-session-initialized.target
1313
${CMAKE_CURRENT_BINARY_DIR}/dde-session-manager.service
14-
dde-session-manager.target
1514
dde-session-pre.target
15+
dde-session-core.target
1616
${CMAKE_CURRENT_BINARY_DIR}/dde-session-exit-task.service
1717
${CMAKE_CURRENT_BINARY_DIR}/dde-session-shutdown.service
1818
dde-session-shutdown.target
@@ -26,21 +26,27 @@ set(DDE_SESSION_PRE_WANTS
2626
dde-session-pre.target.wants/dde-quick-login@x11.service
2727
)
2828

29-
# dde-session-initialized.target.wants - TODO: 暂时先放这里，后续应该转移到对应服务
29+
# dde-session-core.target.wants - core desktop components
30+
install(DIRECTORY DESTINATION lib/systemd/user/dde-session-core.target.wants/)
31+
set(DDE_SESSION_CORE_WANTS
32+
dde-session-core.target.wants/dde-shell@DDE.service
33+
dde-session-core.target.wants/dde-shell-plugin@org.deepin.ds.desktop.service
34+
)
35+
36+
# dde-session-initialized.target.wants - other desktop services
3037
install(DIRECTORY DESTINATION lib/systemd/user/dde-session-initialized.target.wants/)
3138
set(DDE_SESSION_INITIALIZED_WANTS
32-
dde-session-initialized.target.wants/dde-shell@DDE.service
33-
dde-session-initialized.target.wants/dde-shell-plugin@org.deepin.ds.desktop.service
3439
dde-session-initialized.target.wants/dde-lock.service
3540
dde-session-initialized.target.wants/dde-polkit-agent.service
3641
)
3742

3843
install(FILES ${DDE_SESSION_PRE_WANTS} DESTINATION lib/systemd/user/)
44+
install(FILES ${DDE_SESSION_CORE_WANTS} DESTINATION lib/systemd/user/)
3945
install(FILES ${DDE_SESSION_INITIALIZED_WANTS} DESTINATION lib/systemd/user/)
4046
install_symlink(dde-session@x11.service dde-session-pre.target.wants)
4147
install_symlink(dde-quick-login@x11.service dde-session-pre.target.wants)
42-
install_symlink(dde-shell-plugin@org.deepin.ds.desktop.service dde-session-initialized.target.wants)
43-
install_symlink(dde-shell@DDE.service dde-session-initialized.target.wants)
48+
install_symlink(dde-shell@DDE.service dde-session-core.target.wants)
49+
install_symlink(dde-shell-plugin@org.deepin.ds.desktop.service dde-session-core.target.wants)
4450
install_symlink(dde-lock.service dde-session-initialized.target.wants)
4551
install_symlink(dde-polkit-agent.service dde-session-initialized.target.wants)
4652

‎systemd/dde-session-core.target‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[Unit]
2+
Description=dde-session-core target, core desktop components to be run after pre-target and before initialized-target.
3+
OnFailure=dde-session-shutdown.target
4+
OnFailureJobMode=replace-irreversibly
5+
DefaultDependencies=no
6+
RefuseManualStart=yes
7+
RefuseManualStop=yes
8+
9+
Requires=dde-session-pre.target
10+
After=dde-session-pre.target
11+
12+
PartOf=dde-session-initialized.target
13+
Before=dde-session-initialized.target

systemd/dde-session-initialized.target.wants/dde-shell-plugin@org.deepin.ds.desktop.service renamed to systemd/dde-session-core.target.wants/dde-shell-plugin@org.deepin.ds.desktop.service

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ CollectMode=inactive-or-failed
88
Requisite=dde-session-pre.target
99
After=dde-session-pre.target
1010

11-
Requisite=dde-session-initialized.target
12-
PartOf=dde-session-initialized.target
13-
Before=dde-session-initialized.target
11+
PartOf=dde-session-core.target
12+
Before=dde-session-core.target
1413

1514
Requires=dbus.socket
1615
After=dbus.socket

systemd/dde-session-initialized.target.wants/dde-shell@DDE.service renamed to systemd/dde-session-core.target.wants/dde-shell@DDE.service

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ CollectMode=inactive-or-failed
88
Requisite=dde-session-pre.target
99
After=dde-session-pre.target
1010

11-
Requisite=dde-session-initialized.target
12-
PartOf=dde-session-initialized.target
13-
Before=dde-session-initialized.target
11+
PartOf=dde-session-core.target
12+
Before=dde-session-core.target
1413

1514
Requires=dbus.socket
1615
After=dbus.socket

‎systemd/dde-session-initialized.target‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ DefaultDependencies=no
66
RefuseManualStart=yes
77
RefuseManualStop=yes
88

9-
Requires=dde-session-pre.target
10-
After=dde-session-pre.target
9+
Requires=dde-session-core.target
10+
After=dde-session-core.target
1111

12-
Requisite=dde-session.target
1312
PartOf=dde-session.target
1413
Before=dde-session.target

‎systemd/dde-session-initialized.target.wants/dde-lock.service‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ RefuseManualStop=no
55
CollectMode=inactive-or-failed
66
StartLimitBurst=3
77

8-
Requisite=dde-session-pre.target
9-
After=dde-session-pre.target
8+
Requisite=dde-session-core.target
9+
After=dde-session-core.target
1010

11-
Requisite=dde-session-initialized.target
1211
PartOf=dde-session-initialized.target
1312
Before=dde-session-initialized.target
1413

‎systemd/dde-session-initialized.target.wants/dde-polkit-agent.service‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ RefuseManualStop=no
55
StartLimitBurst=3
66
CollectMode=inactive-or-failed
77

8-
Requisite=dde-session-pre.target
9-
After=dde-session-pre.target
8+
Requisite=dde-session-core.target
9+
After=dde-session-core.target
1010

11-
Requisite=dde-session-initialized.target
1211
PartOf=dde-session-initialized.target
1312
Before=dde-session-initialized.target
1413

‎systemd/dde-session-manager.service.in‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@ OnFailure=dde-session-shutdown.target
66
OnFailureJobMode=replace-irreversibly
77
CollectMode=inactive-or-failed
88

9-
Requisite=dde-session-pre.target
109
Before=dde-session-pre.target
1110

12-
Requires=dde-session-manager.target
13-
PartOf=dde-session-manager.target
14-
Before=dde-session-manager.target
15-
1611
[Service]
1712
Type=notify
1813
NotifyAccess=main

‎systemd/dde-session-manager.target‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎systemd/dde-session-pre.target‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ RefuseManualStop=yes
99
Requires=graphical-session-pre.target
1010
After=graphical-session-pre.target
1111

12-
Requires=dde-session-initialized.target
13-
PartOf=dde-session-initialized.target
14-
Before=dde-session-initialized.target
12+
PartOf=dde-session-core.target
13+
Before=dde-session-core.target

0 commit comments

Comments
 (0)