Reorganize xorg.conf files and create ConsoleKit config files.

10 files changed, 79 insertions, 1 deletions

diff --git a/etc/ConsoleKit/displays.d/Seat1.display b/etc/ConsoleKit/displays.d/Seat1.display
new file mode 100644
index 0000000..f2b84b7
--- /dev/null
+++ b/etc/ConsoleKit/displays.d/Seat1.display
@@ -0,0 +1,5 @@
+[Display]
+Type=X11
+
+[X11]
+Exec=/opt/xorg/bin/X -config /etc/X11/xorg.conf.seat1 $display -br -audit 0 -verbose -auth $auth -nolisten tcp
diff --git a/etc/ConsoleKit/displays.d/Seat2.display b/etc/ConsoleKit/displays.d/Seat2.display
new file mode 100644
index 0000000..454e669
--- /dev/null
+++ b/etc/ConsoleKit/displays.d/Seat2.display
@@ -0,0 +1,5 @@
+[Display]
+Type=X11
+
+[X11]
+Exec=/opt/xorg/bin/X -config /etc/X11/xorg.conf.seat2 $display -br -audit 0 -verbose -auth $auth -nolisten tcp
diff --git a/etc/ConsoleKit/seats.d/00-primary.seat b/etc/ConsoleKit/seats.d/00-primary.seat
new file mode 100644
index 0000000..b8affdb
--- /dev/null
+++ b/etc/ConsoleKit/seats.d/00-primary.seat
@@ -0,0 +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=true
+
+# 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/etc/ConsoleKit/seats.d/01-seat1.seat b/etc/ConsoleKit/seats.d/01-seat1.seat
new file mode 100644
index 0000000..3f8da0a
--- /dev/null
+++ b/etc/ConsoleKit/seats.d/01-seat1.seat
@@ -0,0 +1,11 @@
+[Seat Entry]
+Version=1.0
+Name=Primary seat
+ID=Seat1
+Description=Seat 1
+
+Hidden=false
+
+Devices=
+
+Sessions=Seat1;
diff --git a/etc/ConsoleKit/seats.d/02-seat2.seat b/etc/ConsoleKit/seats.d/02-seat2.seat
new file mode 100644
index 0000000..f444f6d
--- /dev/null
+++ b/etc/ConsoleKit/seats.d/02-seat2.seat
@@ -0,0 +1,11 @@
+[Seat Entry]
+Version=1.0
+Name=Secondary seat
+ID=Seat2
+Description=Seat 2
+
+Hidden=false
+
+Devices=
+
+Sessions=Seat2;
diff --git a/etc/ConsoleKit/sessions.d/Seat1.session b/etc/ConsoleKit/sessions.d/Seat1.session
new file mode 100644
index 0000000..f14fba6
--- /dev/null
+++ b/etc/ConsoleKit/sessions.d/Seat1.session
@@ -0,0 +1,8 @@
+[Session Entry]
+Name=Local
+Type=LoginWindow
+Description=Local Login Screen
+DisplayTemplate=Seat1
+
+[Local]
+display=:1
diff --git a/etc/ConsoleKit/sessions.d/Seat2.session b/etc/ConsoleKit/sessions.d/Seat2.session
new file mode 100644
index 0000000..8f30ef7
--- /dev/null
+++ b/etc/ConsoleKit/sessions.d/Seat2.session
@@ -0,0 +1,8 @@
+[Session Entry]
+Name=Local
+Type=LoginWindow
+Description=Local Login Screen
+DisplayTemplate=Seat2
+
+[Local]
+display=:2
diff --git a/etc/xorg.conf.seat1 b/etc/X11/xorg.conf.seat1
index 6255aee..6255aee 100644
--- a/etc/xorg.conf.seat1
+++ b/etc/X11/xorg.conf.seat1
diff --git a/etc/xorg.conf.seat2 b/etc/X11/xorg.conf.seat2
index 5958e6d..5958e6d 100644
--- a/etc/xorg.conf.seat2
+++ b/etc/X11/xorg.conf.seat2
diff --git a/install.sh b/install.sh
index 4d43444..f92acb9 100755
--- a/install.sh
+++ b/install.sh
@@ -4,6 +4,7 @@
 SRC_DIR=/usr/sbin/
 UDEV_DIR=/lib/udev/rules.d/
 XORG_CONFIG_DIR=/etc/X11/
+CONSOLE_KIT_CONFIG_DIR=/etc/ConsoleKit/
 
 echo "Installing 'sead-id' script to name the seats."
 mv src/seat-id $SRC_DIR
@@ -12,4 +13,7 @@ echo "Installing udev rules for detect the Plugable Dock Stations."
 mv udev/50-usbseat.rules $UDEV_DIR
 
 echo "Install Xorg configuration files for two static seats"
-mv etc/xorg.conf.seat{1,2} $XORG_CONFIG_DIR
+mv etc/X11/ $XORG_CONFIG_DIR
+
+echo "Configuring ConsoleKit"
+mv etc/ConsoleKit/ $CONSOLE_KIT_CONFIG_DIR