Skip to content

chore: Change user unit orders #92

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

Closed
ArchieMeng wants to merge 1 commit into from
Closed

chore: Change user unit orders #92

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
7 changes: 7 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
dde-session (1.2.14) UNRELEASED; urgency=medium

* chore: Remove dde-shell@DDE.service's dependency on dde-session-daemon (#91)
* chore: Change user unit orders

-- Yutao Meng <mengyutao@deepin.org> Sat, 12 Oct 2024 15:54:13 +0800

dde-session (1.2.13) unstable; urgency=medium

* chore: 解决修改快捷键配置重启后恢复的问题
Expand Down
4 changes: 2 additions & 2 deletions systemd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ install(FILES ${SERVICES} DESTINATION lib/systemd/user/)

install(DIRECTORY DESTINATION lib/systemd/user/dde-session-pre.target.wants/)
set(DDE_SESSION_PRE_WANTS
dde-session-pre.target.wants/dde-session@x11.service
dde-session-pre.target.wants/dde-display.service
)

# dde-session-initialized.target.wants - TODO: 暂时先放这里，后续应该转移到对应服务
install(DIRECTORY DESTINATION lib/systemd/user/dde-session-initialized.target.wants/)
set(DDE_SESSION_INITIALIZED_WANTS
dde-session-initialized.target.wants/dde-desktop.service
dde-session-initialized.target.wants/dde-session@x11.service
dde-session-initialized.target.wants/dde-shell@DDE.service
dde-session-initialized.target.wants/dde-lock.service
dde-session-initialized.target.wants/dde-osd.service
Expand All @@ -39,9 +39,9 @@ set(DDE_SESSION_INITIALIZED_WANTS

install(FILES ${DDE_SESSION_PRE_WANTS} DESTINATION lib/systemd/user/)
install(FILES ${DDE_SESSION_INITIALIZED_WANTS} DESTINATION lib/systemd/user/)
install_symlink(dde-session@x11.service dde-session-pre.target.wants)
install_symlink(dde-display.service dde-session-pre.target.wants)
install_symlink(dde-desktop.service dde-session-initialized.target.wants)
install_symlink(dde-session@x11.service dde-session-initialized.target.wants)
install_symlink(dde-shell@DDE.service dde-session-initialized.target.wants)
install_symlink(dde-lock.service dde-session-initialized.target.wants)
install_symlink(dde-polkit-agent.service dde-session-initialized.target.wants)
Expand Down
6 changes: 3 additions & 3 deletions ...-pre.target.wants/dde-session@x11.service → ...ized.target.wants/dde-session@x11.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ OnFailure=dde-session-shutdown.target
OnFailureJobMode=replace
CollectMode=inactive-or-failed

Requisite=dde-session-pre.target
PartOf=dde-session-pre.target
Before=dde-session-pre.target
Requisite=dde-session-initialized.target
PartOf=dde-session-initialized.target
Before=dde-session-initialized.target

# Limit startup frequency more than the default
StartLimitIntervalSec=15s
Expand Down
Loading