From c15a4691783aa1b32b6a6a442175e509ac405416 Mon Sep 17 00:00:00 2001 From: Zhang Dingyuan Date: Mon, 24 Jun 2024 10:02:59 +0800 Subject: [PATCH] chore: dde-session-daemon work on TreeLand dde-shell needs dde-session-daemon. Log: --- systemd/CMakeLists.txt | 2 -- .../dde-shell@DDE.service | 1 - .../dde-shell@TreeLand.service | 33 ------------------- 3 files changed, 36 deletions(-) delete mode 100644 systemd/dde-session-initialized.target.wants/dde-shell@TreeLand.service diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index f43799c..2a1986a 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -31,7 +31,6 @@ install(DIRECTORY DESTINATION lib/systemd/user/dde-session-initialized.target.wa set(DDE_SESSION_INITIALIZED_WANTS dde-session-initialized.target.wants/dde-desktop.service dde-session-initialized.target.wants/dde-shell@DDE.service - dde-session-initialized.target.wants/dde-shell@TreeLand.service dde-session-initialized.target.wants/dde-lock.service dde-session-initialized.target.wants/dde-osd.service dde-session-initialized.target.wants/dde-osd.target @@ -44,7 +43,6 @@ 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-shell@DDE.service dde-session-initialized.target.wants) -install_symlink(dde-shell@TreeLand.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) install_symlink(dde-osd.service dde-session-initialized.target.wants) diff --git a/systemd/dde-session-initialized.target.wants/dde-shell@DDE.service b/systemd/dde-session-initialized.target.wants/dde-shell@DDE.service index 2ab682c..eff72a3 100644 --- a/systemd/dde-session-initialized.target.wants/dde-shell@DDE.service +++ b/systemd/dde-session-initialized.target.wants/dde-shell@DDE.service @@ -28,7 +28,6 @@ After=org.dde.session.Daemon1.service [Service] Type=simple -ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "x11" || exit 2' ExecStart=/usr/bin/dde-shell -C %I TimeoutStartSec=infinity Slice=session.slice diff --git a/systemd/dde-session-initialized.target.wants/dde-shell@TreeLand.service b/systemd/dde-session-initialized.target.wants/dde-shell@TreeLand.service deleted file mode 100644 index 3cad357..0000000 --- a/systemd/dde-session-initialized.target.wants/dde-shell@TreeLand.service +++ /dev/null @@ -1,33 +0,0 @@ -[Unit] -Description=dde-shell for DDE service on TreeLand -RefuseManualStart=no -RefuseManualStop=no -StartLimitBurst=3 -CollectMode=inactive-or-failed - -Requisite=dde-session-pre.target -After=dde-session-pre.target - -Requisite=dde-session-initialized.target -PartOf=dde-session-initialized.target -Before=dde-session-initialized.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 -Wants=org.desktopspec.ApplicationManager1.service -After=org.desktopspec.ApplicationManager1.service - -[Service] -Type=simple -ExecCondition=/bin/sh -c 'test "$DDE_CURRENT_COMPOSITOR" = "%I" || exit 2' -ExecStart=/usr/bin/dde-shell -C DDE -d org.deepin.ds.dock.tray -TimeoutStartSec=infinity -Slice=session.slice -Restart=on-failure -RestartSec=1s