diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/00-primary.seat | 23 | ||||
-rw-r--r-- | data/ConsoleKit.conf | 32 | ||||
-rw-r--r-- | data/Makefile.am | 5 | ||||
-rw-r--r-- | data/displays.d/Headless.display.in | 5 | ||||
-rw-r--r-- | data/displays.d/Local.display.in | 5 | ||||
-rw-r--r-- | data/displays.d/LocalVNC.display.in | 5 | ||||
-rw-r--r-- | data/displays.d/Makefile.am | 29 | ||||
-rw-r--r-- | data/displays.d/RemoteMachine.display.in | 5 | ||||
-rw-r--r-- | data/sessions.d/Headless.session | 8 | ||||
-rw-r--r-- | data/sessions.d/Local.session | 9 | ||||
-rw-r--r-- | data/sessions.d/LocalVNC.session | 8 | ||||
-rw-r--r-- | data/sessions.d/Makefile.am | 16 | ||||
-rw-r--r-- | data/sessions.d/Remote.session | 9 |
13 files changed, 155 insertions, 4 deletions
diff --git a/data/00-primary.seat b/data/00-primary.seat index 6e61db4..0632382 100644 --- a/data/00-primary.seat +++ b/data/00-primary.seat @@ -1,5 +1,26 @@ [Seat Entry] Version=1.0 Name=Primary seat +# Specified Seat ID, if this value is NULL, ConsoleKit will decide one. +# The ID only contain the ASICC characters "[A-Z][a-z][0-9]_" +ID=StaticSeat1 +Description=start one static local display at :0 + +# Indicate whether to create this seat or not. If it is set true, then CK will +# not create this seat. Default value is false. Hidden=false -Devices=
\ No newline at end of file + +# Indicate input/output devices including keyboard-pointer-video +# card-monitor-sound-usb devices, +# This key will not implemented now, it might need be divided into +# several keys in the future: +# Pointer= +# Monitor= +# VideoCard= +# Monitor= +# UsbHub= +Devices= + +# List of sessions to start on the seat, separated by ';' +# Each session is defined in sessions.d/ +Sessions=Local; diff --git a/data/ConsoleKit.conf b/data/ConsoleKit.conf index 948f95f..8cf490a 100644 --- a/data/ConsoleKit.conf +++ b/data/ConsoleKit.conf @@ -44,6 +44,9 @@ send_member="CloseSession"/> <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Manager" + send_member="GetUnmanagedSeats"/> + <allow send_destination="org.freedesktop.ConsoleKit" + send_interface="org.freedesktop.ConsoleKit.Manager" send_member="GetSeats"/> <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Manager" @@ -69,6 +72,18 @@ <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Manager" send_member="GetSystemIdleSinceHint"/> + <allow send_destination="org.freedesktop.ConsoleKit" + send_interface="org.freedesktop.ConsoleKit.Manager" + send_member="AddSeat"/> + <allow send_destination="org.freedesktop.ConsoleKit" + send_interface="org.freedesktop.ConsoleKit.Manager" + send_member="RemoveSeat"/> + <allow send_destination="org.freedesktop.ConsoleKit" + send_interface="org.freedesktop.ConsoleKit.Manager" + send_member="AddSession"/> + <allow send_destination="org.freedesktop.ConsoleKit" + send_interface="org.freedesktop.ConsoleKit.Manager" + send_member="RemoveSession"/> <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Seat" @@ -88,6 +103,9 @@ <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Seat" send_member="ActivateSession"/> + <allow send_destination="org.freedesktop.ConsoleKit" + send_interface="org.freedesktop.ConsoleKit.Seat" + send_member="ManageSeat"/> <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Session" @@ -103,6 +121,9 @@ send_member="GetSessionType"/> <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Session" + send_member="GetDisplayType"/> + <allow send_destination="org.freedesktop.ConsoleKit" + send_interface="org.freedesktop.ConsoleKit.Session" send_member="GetUser"/> <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Session" @@ -127,6 +148,12 @@ send_member="IsLocal"/> <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Session" + send_member="IsDynamic"/> + <allow send_destination="org.freedesktop.ConsoleKit" + send_interface="org.freedesktop.ConsoleKit.Session" + send_member="IsOpen"/> + <allow send_destination="org.freedesktop.ConsoleKit" + send_interface="org.freedesktop.ConsoleKit.Session" send_member="GetCreationTime"/> <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Session" @@ -136,12 +163,11 @@ send_member="GetIdleHint"/> <allow send_destination="org.freedesktop.ConsoleKit" send_interface="org.freedesktop.ConsoleKit.Session" - send_member="SetIdleHint"/> - <allow send_destination="org.freedesktop.ConsoleKit" - send_interface="org.freedesktop.ConsoleKit.Session" send_member="GetIdleSinceHint"/> <allow send_interface="org.freedesktop.ConsoleKit.Session" send_member="SetIdleHint"/> + <allow send_interface="org.freedesktop.ConsoleKit.Session" + send_member="SetRemoveOnClose"/> </policy> </busconfig> diff --git a/data/Makefile.am b/data/Makefile.am index 248f7cd..9f11bad 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,10 @@ NULL = +SUBDIRS = \ + displays.d \ + sessions.d \ + $(NULL) + dbusconfdir = $(DBUS_SYS_DIR) dbusconf_DATA = ConsoleKit.conf diff --git a/data/displays.d/Headless.display.in b/data/displays.d/Headless.display.in new file mode 100644 index 0000000..754d2bf --- /dev/null +++ b/data/displays.d/Headless.display.in @@ -0,0 +1,5 @@ +[Display] +Type=X11 + +[X11] +Exec=@X11_DIR@/Xvfb $display -auth $auth diff --git a/data/displays.d/Local.display.in b/data/displays.d/Local.display.in new file mode 100644 index 0000000..b845a7b --- /dev/null +++ b/data/displays.d/Local.display.in @@ -0,0 +1,5 @@ +[Display] +Type=X11 + +[X11] +Exec=@X11_DIR@/Xorg $display -br -verbose -auth $auth -nolisten tcp $vt diff --git a/data/displays.d/LocalVNC.display.in b/data/displays.d/LocalVNC.display.in new file mode 100644 index 0000000..6ad336b --- /dev/null +++ b/data/displays.d/LocalVNC.display.in @@ -0,0 +1,5 @@ +[Display] +Type=X11 + +[X11] +Exec=@X11_DIR@/Xvnc $display -auth $auth -query localhost diff --git a/data/displays.d/Makefile.am b/data/displays.d/Makefile.am new file mode 100644 index 0000000..1fab1d2 --- /dev/null +++ b/data/displays.d/Makefile.am @@ -0,0 +1,29 @@ +NULL = + +displaydir = $(sysconfdir)/ConsoleKit/displays.d +display_in_files = \ + Local.display.in \ + RemoteMachine.display.in \ + LocalVNC.display.in \ + Headless.display.in + +display_DATA = $(display_in_files:.display.in=.display) + +Local.display: Local.display.in Makefile + sed -e "s|\@X11_DIR\@|$(X11_DIR)|" $< > $@ +RemoteMachine.display: RemoteMachine.display.in Makefile + sed -e "s|\@X11_DIR\@|$(X11_DIR)|" $< > $@ +LocalVNC.display: LocalVNC.display.in Makefile + sed -e "s|\@X11_DIR\@|$(X11_DIR)|" $< > $@ +Headless.display: Headless.display.in Makefile + sed -e "s|\@X11_DIR\@|$(X11_DIR)|" $< > $@ + +EXTRA_DIST = \ + $(display_in_files) \ + $(NULL) + +MAINTAINERCLEANFILES = \ + *~ \ + Makefile.in + +CLEANFILES = $(display_DATA) diff --git a/data/displays.d/RemoteMachine.display.in b/data/displays.d/RemoteMachine.display.in new file mode 100644 index 0000000..7c69451 --- /dev/null +++ b/data/displays.d/RemoteMachine.display.in @@ -0,0 +1,5 @@ +[Display] +Type=X11 + +[X11] +Exec=@X11_DIR@/Xorg $display -br -verbose -auth $auth -indirect $vt diff --git a/data/sessions.d/Headless.session b/data/sessions.d/Headless.session new file mode 100644 index 0000000..d376af9 --- /dev/null +++ b/data/sessions.d/Headless.session @@ -0,0 +1,8 @@ +[Session Entry] +Name=Headless +Type=LoginWindow +Description=Login Window running on headless display +DisplayTemplate=Headless + +[Headless] +display=:32 diff --git a/data/sessions.d/Local.session b/data/sessions.d/Local.session new file mode 100644 index 0000000..9d3b975 --- /dev/null +++ b/data/sessions.d/Local.session @@ -0,0 +1,9 @@ +[Session Entry] +Name=Local +Type=LoginWindow +Description=Local Login Screen +DisplayTemplate=Local + +[Local] +display=:0 +vt=vt1 diff --git a/data/sessions.d/LocalVNC.session b/data/sessions.d/LocalVNC.session new file mode 100644 index 0000000..c05802f --- /dev/null +++ b/data/sessions.d/LocalVNC.session @@ -0,0 +1,8 @@ +[Session Entry] +Name=LocalVNC +Type=LoginWindow +Description=Connect to local VNC server running on same machine +DisplayTemplate=LocalVNC + +[LocalVNC] +display=:64 diff --git a/data/sessions.d/Makefile.am b/data/sessions.d/Makefile.am new file mode 100644 index 0000000..f17ffdc --- /dev/null +++ b/data/sessions.d/Makefile.am @@ -0,0 +1,16 @@ +NULL = + +sessiondir = $(sysconfdir)/ConsoleKit/sessions.d +session_DATA = \ + Headless.session \ + Local.session \ + LocalVNC.session \ + Remote.session + +EXTRA_DIST = \ + $(session_DATA) \ + $(NULL) + +MAINTAINERCLEANFILES = \ + *~ \ + Makefile.in diff --git a/data/sessions.d/Remote.session b/data/sessions.d/Remote.session new file mode 100644 index 0000000..e88f975 --- /dev/null +++ b/data/sessions.d/Remote.session @@ -0,0 +1,9 @@ +[Session Entry] +Name=Remote Chooser +Type=Remote +Description=Connect to chooser on nearby remote machine +DisplayTemplate=RemoteMachine + +[RemoteMachine] +display=:96 +vt=vt10 |