diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-07-09 16:07:14 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-07-09 16:07:14 +1200 |
| commit | ef8ef07ee468c431d5d537bdb476fc356c492525 (patch) | |
| tree | ae346085b87bfbf61e0e9d8f70a440ca02538509 /data | |
| parent | ca1be35d2461cf4d2dff2ee835d5a4f3712bb336 (diff) | |
| parent | 06324ab22844e630d4b9b3336ff1a6d482353d8f (diff) | |
| download | lightdm-git-ef8ef07ee468c431d5d537bdb476fc356c492525.tar.gz | |
Merge with trunk
Diffstat (limited to 'data')
| -rw-r--r-- | data/lightdm.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/lightdm.conf b/data/lightdm.conf index e9d2f880..20148a02 100644 --- a/data/lightdm.conf +++ b/data/lightdm.conf @@ -44,6 +44,8 @@ # xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true) # xdmcp-port = XDMCP UDP/IP port to communicate on # xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf) +# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option) +# unity-compositor-timeout = Number of seconds to wait for compositor to start # greeter-session = Session to load for greeter # greeter-hide-users = True to hide the user list # greeter-allow-guest = True if the greeter should show a guest login option @@ -75,6 +77,8 @@ #xdmcp-manager= #xdmcp-port=177 #xdmcp-key= +#unity-compositor-command=unity-system-compositor +#unity-compositor-timeout=60 #greeter-session=example-gtk-gnome #greeter-hide-users=false #greeter-allow-guest=true |