diff options
author | Michael Terry <michael.terry@canonical.com> | 2011-08-30 09:48:03 -0400 |
---|---|---|
committer | Michael Terry <michael.terry@canonical.com> | 2011-08-30 09:48:03 -0400 |
commit | 9f08393a2d2af6defbd8ed1263f1cf6b4652b3b9 (patch) | |
tree | 333971adef15fdaf8ca3486b4077a81e21059c1b /data | |
parent | 404318dd3e662018c01fc518d780dd6b68bc3f80 (diff) | |
parent | 57fddd0360c097ed5a298d3473ddc2ec8ecdac52 (diff) | |
download | lightdm-9f08393a2d2af6defbd8ed1263f1cf6b4652b3b9.tar.gz |
merge from trunk
Diffstat (limited to 'data')
-rw-r--r-- | data/lightdm.conf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/data/lightdm.conf b/data/lightdm.conf index afeed8b6..c64de99c 100644 --- a/data/lightdm.conf +++ b/data/lightdm.conf @@ -41,6 +41,9 @@ # allow-guest = True if guest login is allowed # guest-session = Session to load for guests (overrides user-session) # session-wrapper = Wrapper script to run session with +# display-setup-script = Script to run when starting a greeter session (runs as root) +# session-setup-script = Script to run when starting a user session (runs as root) +# session-cleanup-script = Script to run when quitting a user session (runs as root) # autologin-guest = True to log in as guest by default # autologin-user = User to log in with by default (overrides autologin-guest) # autologin-user-timeout = Number of seconds to wait before loading default user @@ -59,6 +62,9 @@ #allow-guest=true #guest-session=UNIMPLEMENTED #session-wrapper=lightdm-session +#display-setup-script= +#session-setup-script= +#session-cleanup-script= #autologin-guest=false #autologin-user= #autologin-user-timeout=0 |