Skip to content
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.

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

Disable xfce4 screensaver rather than light-locker (add user docs) #2128

Merged
merged 13 commits into from
Aug 15, 2024

Conversation

JimMadge
Copy link
Member

@JimMadge JimMadge commented Aug 14, 2024

✅ Checklist

  • You have given your pull request a meaningful title (e.g. Enable foobar integration rather than 515 foobar).
  • You are targeting the appropriate branch. If you're not certain which one this is, it should be develop.
  • Your branch is up-to-date with the target branch (it probably was when you started, but it may have changed since then).

🚦 Depends on

⤴️ Summary

Adds an Ansible task to disable xfce4-screensaver.
This appears to not work due to a bug in xfce < 4.18.

Adds user documentation to disable screen locking if they find it a pain.

🌂 Related issues

Related to #2101

🔬 Tests

@JimMadge JimMadge mentioned this pull request Aug 14, 2024
3 tasks
@JimMadge
Copy link
Member Author

Testing in an SRE.
The file is written as expected

jim.madge:autostart$ tail xfce4-screensaver.desktop
Exec=xfce4-screensaver
OnlyShowIn=XFCE;
NoDisplay=true
X-XFCE-Autostart-Phase=Application
X-XFCE-Autostart-Notify=true
X-XFCE-Bugzilla-Bugzilla=XFCE
X-XFCE-Bugzilla-Product=xfce4-screensaver
X-XFCE-Bugzilla-Component=general
X-XFCE-Bugzilla-Version=4.16.0
Hidden=true

@JimMadge
Copy link
Member Author

Started a new xfce session by logging out then in again.
Waiting to see if the screen locks after idling.

Copy link

Coverage report

This PR does not seem to contain any modification to coverable code.

@JimMadge
Copy link
Member Author

Still locking after ~10 minutes.

@JimMadge
Copy link
Member Author

There is this bug report which suggests there was an issue in xfce4-session<4.18 and we have xfce4-session==4.16.

@JimMadge
Copy link
Member Author

JimMadge commented Aug 14, 2024

Uninstalling xfce4-screensaver seems to work and doesn't break the xfce installation.
It does mean that users can't intentionally lock the xrdp session.

I think we are comfortable with this though because users will always be on a client machine that they can lock.

Actually, that is a bad idea. The screen blanks and you are unable to unlock it 😱.
@jemrobinson I think it might be best to revert the change and accept this.
Normal users should be able to disable screen locking after idle in the Xfce4 settings or by running xfce4-screensaver-preferences. We could add that to the user guide?

@JimMadge JimMadge marked this pull request as ready for review August 14, 2024 13:51
@JimMadge JimMadge requested a review from a team as a code owner August 14, 2024 13:51
@jemrobinson
Copy link
Member

Can you add it to the user guide as part of this PR? Ideally, after merging #2130.

@JimMadge
Copy link
Member Author

Yep, just testing that it works now.

@JimMadge JimMadge requested a review from a team as a code owner August 15, 2024 10:05
@JimMadge JimMadge changed the title Disable xfce4 screensaver rather than light-locker Disable xfce4 screensaver rather than light-locker (add user docs) Aug 15, 2024
@JimMadge JimMadge requested a review from jemrobinson August 15, 2024 10:58
Copy link
Member

@jemrobinson jemrobinson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - a couple of suggestions.

@JimMadge JimMadge merged commit 2330733 into release-v5.0.0 Aug 15, 2024
11 checks passed
@JimMadge JimMadge deleted the xfce4-screensaver branch August 15, 2024 13:18
@JimMadge JimMadge mentioned this pull request Sep 13, 2024
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants