Skip to content

Disable DPMS from a central code point, lightdm startup script #283

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

Open
skarbat wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disable DPMS from a central code point, lightdm startup script #283

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: 0 additions & 7 deletions bin/kano-ui-autostart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,6 @@ systemctl --user import-environment
# We need the home button service for the loading dialog
systemctl --user start kano-home-button &

# Disable XServer screen saver time and screen blanking (The display would become black)
if [ -n "`which xset`" ]; then
xset s off
xset -dpms
xset s noblank
fi

# If we are in the middle of the Overture Onboarding, quit now.
# This means that the Overture app started the X server in the background.
# TODO: Do we want a special wallpaper here? It will be black, as the overture terminal
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ kano-desktop (3.15.0-0) unstable; urgency=low

* Fixed eventual black screen saver after onboarding on first boot

-- Team Kano <[email protected]> Thu, 21 Dec 2017 10:45:00 +0100
-- Team Kano <[email protected]> Wed, 10 Jan 2018 17:58:00 +0100

kano-desktop (3.14.0-0) unstable; urgency=low

Expand Down
2 changes: 2 additions & 0 deletions scripts/ldm-session-cleanup-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
# This script is called by lightm when the user logs off
# We collect the time the users spent on this session and save it on the tracker
#
# WARNING: This script is run as root, not the interactive user
#

su - $USER -c "kano-tracker-ctl session end logon-session 0"
su - $USER -c "kano-tracker-ctl clear"
Expand Down
11 changes: 10 additions & 1 deletion scripts/ldm-session-setup-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,28 @@

# ldm-session-setup-script
#
# Copyright (C) 2014,2015 Kano Computing Ltd.
# Copyright (C) 2014,2015,2018 Kano Computing Ltd.
# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
#
# https://wiki.ubuntu.com/LightDM
#
# This script is called by lightm during user logon session
# We save the current time here so we can estimate usage timings
#
# WARNING: This script is run as root, not the interactive user
#

# Tracking of actions, in the background saves ~ 2secs on a RPi2
su - $USER -c "kano-tracker-ctl clear &"
su - $USER -c "kano-tracker-ctl new-token &"
su - $USER -c "kano-tracker-ctl session start logon-session 0 &"

# Disable XServer screen saver time and screen blanking (The display would become black)
if [ -n "`which xset`" ]; then
xset s off
xset -dpms
xset s noblank
fi

# zero means proceed with login, anything else will cancel the session
exit 0