← Back to branch summary

~robert-ancell/lightdm/signal-fix

« back to all changes in this revision

Viewing changes to data/lightdm.conf

  • Committer: Robert Ancell
  • Date: 2013-08-21 23:16:57 UTC
  • mfrom: (1664.1.91 trunk)
  • Revision ID: robert.ancell@canonical.com-20130821231657-yr579a9fw13n834z
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/lightdm.conf
11
11
# log-directory = Directory to log information to
12
12
# run-directory = Directory to put running state in
13
13
# cache-directory = Directory to cache to
14
 
# xsessions-directory = Directory to find X sessions
 
14
# sessions-directory = Directory to find sessions
15
15
# remote-sessions-directory = Directory to find remote sessions
16
 
# xgreeters-directory = Directory to find X greeters
 
16
# greeters-directory = Directory to find greeters
17
17
# disable-guest-wrapper = Disable using guest session wrapper (temporary? required to make tests work without installing)
18
18
#
19
19
[LightDM]
27
27
#log-directory=/var/log/lightdm
28
28
#run-directory=/var/run/lightdm
29
29
#cache-directory=/var/cache/lightdm
30
 
#xsessions-directory=/usr/share/xsessions
 
30
#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions
31
31
#remote-sessions-directory=/usr/share/lightdm/remote-sessions
32
 
#xgreeters-directory=/usr/share/xgreeters
 
32
#greeters-directory=/usr/share/lightdm/greeters:/usr/share/xgreeters
33
33
#disable-guest-wrapper=false
34
34
 
35
35
#
40
40
# xserver-layout = Layout to pass to X server
41
41
# xserver-config = Config file to pass to X server
42
42
# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
 
43
# xserver-share = True if the X server is shared for both greeter and session
43
44
# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
44
45
# xdmcp-port = XDMCP UDP/IP port to communicate on
45
46
# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
 
47
# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
 
48
# unity-compositor-timeout = Number of seconds to wait for compositor to start
46
49
# greeter-session = Session to load for greeter
47
50
# greeter-hide-users = True to hide the user list
48
51
# greeter-allow-guest = True if the greeter should show a guest login option
52
55
# allow-guest = True if guest login is allowed
53
56
# guest-session = Session to load for guests (overrides user-session)
54
57
# session-wrapper = Wrapper script to run session with
 
58
# greeter-wrapper = Wrapper script to run greeter with
55
59
# display-setup-script = Script to run when starting a greeter session (runs as root)
56
60
# greeter-setup-script = Script to run when starting a greeter (runs as root)
57
61
# session-setup-script = Script to run when starting a user session (runs as root)
69
73
#xserver-layout=
70
74
#xserver-config=
71
75
#xserver-allow-tcp=false
 
76
#xserver-share=true
72
77
#xdmcp-manager=
73
78
#xdmcp-port=177
74
79
#xdmcp-key=
 
80
#unity-compositor-command=unity-system-compositor
 
81
#unity-compositor-timeout=60
75
82
#greeter-session=example-gtk-gnome
76
83
#greeter-hide-users=false
77
84
#greeter-allow-guest=true
81
88
#allow-guest=true
82
89
#guest-session=UNIMPLEMENTED
83
90
#session-wrapper=lightdm-session
 
91
#greeter-wrapper=
84
92
#display-setup-script=
85
93
#greeter-setup-script=
86
94
#session-setup-script=