diff --git a/systemd/dde-session-pre.target.wants/dde-quick-login@x11.service b/systemd/dde-session-pre.target.wants/dde-quick-login@x11.service index 92e3851..9ff47a4 100644 --- a/systemd/dde-session-pre.target.wants/dde-quick-login@x11.service +++ b/systemd/dde-session-pre.target.wants/dde-quick-login@x11.service @@ -8,15 +8,16 @@ After=dde-session@x11.service PartOf=dde-session-pre.target Before=dde-session-pre.target +# only in quick login mode and x11 +ConditionEnvironment=DDE_QUICKLOGIN=true +ConditionEnvironment=XDG_SESSION_TYPE=%I + # SuccessExitStatus=0,launch dde-lock.service OnSuccess=dde-lock.service dde-version-checker@quick-login.service dde-autostart@quick-login.service [Service] Slice=session.slice Type=notify -# only in quick login mode and x11 -ExecCondition=/bin/sh -c '[ "$DDE_QUICKLOGIN" = "true" ] || exit 255' -ExecCondition=/bin/sh -c '[ "$XDG_SESSION_TYPE" = "%I" ] || exit 255' ExecStart=/usr/bin/dde-quick-login SuccessExitStatus=0 Restart=on-failure diff --git a/tools/dde-version-checker/dde-version-checker@quick-login.service b/tools/dde-version-checker/dde-version-checker@quick-login.service index 38038b1..15a1636 100644 --- a/tools/dde-version-checker/dde-version-checker@quick-login.service +++ b/tools/dde-version-checker/dde-version-checker@quick-login.service @@ -2,6 +2,9 @@ Description=dde-version-checker service (after quick login) CollectMode=inactive-or-failed +# only in quick login mode +ConditionEnvironment=DDE_QUICKLOGIN=true + [Service] Type=simple ExecStart=/usr/bin/dde-version-checker