separate greeter from ldm

24 files changed, 440 insertions, 8 deletions

diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build
index a56982fa..2a1a811c 100644
--- a/remote/tools/base/base.build
+++ b/remote/tools/base/base.build
@@ -76,4 +76,7 @@ post_copy() {
 	# copy kernel modules
 	#[ ! -d ${INIT_DIR}/lib/modules/$(uname -r) ] && mkdir -p ${INIT_DIR}/lib/modules/$(uname -r)
 	#cp -r /lib/modules/$(uname -r) ${INIT_DIR}/lib/modules/$(uname -r)
+
+	#quick fix xterm symlink 
+	ln -s /usr/lib/libXaw7.so.7.0.0 ${INIT_DIR}/usr/lib/libXaw7.so.7
 }
diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf
index 72330a55..df2c77d6 100644
--- a/remote/tools/base/base.conf
+++ b/remote/tools/base/base.conf
@@ -12,7 +12,8 @@ REQUIRED_BINARIES="	bash
 			ldd
 			strace
 			blkid
-			modprobe"
+			modprobe
+			xterm"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
diff --git a/remote/tools/gtk-greeter/data/lightdm.conf b/remote/tools/gtk-greeter/data/lightdm.conf
new file mode 100644
index 00000000..6cb2090c
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/lightdm.conf
@@ -0,0 +1,125 @@
+#
+# General configuration
+#
+# start-default-seat = True to always start one seat if none are defined in the configuration
+# greeter-user = User to run greeter as
+# minimum-display-number = Minimum display number to use for X servers
+# minimum-vt = First VT to run displays on
+# lock-memory = True to prevent memory from being paged to disk
+# user-authority-in-system-dir = True if session authority should be in the system location
+# guest-account-script = Script to be run to setup guest account
+# log-directory = Directory to log information to
+# run-directory = Directory to put running state in
+# cache-directory = Directory to cache to
+# xsessions-directory = Directory to find X sessions
+# remote-sessions-directory = Directory to find remote sessions
+# xgreeters-directory = Directory to find X greeters
+#
+[LightDM]
+#start-default-seat=true
+#greeter-user=lightdm
+#minimum-display-number=0
+#minimum-vt=7
+#lock-memory=true
+#user-authority-in-system-dir=false
+#guest-account-script=guest-account
+#log-directory=/var/log/lightdm
+#run-directory=/var/run/lightdm
+#cache-directory=/var/cache/lightdm
+#xsessions-directory=/usr/share/xsessions
+#remote-sessions-directory=/usr/share/lightdm/remote-sessions
+#xgreeters-directory=/usr/share/xgreeters
+
+#
+# Seat defaults
+#
+# type = Seat type (xlocal, xremote)
+# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
+# xserver-layout = Layout to pass to X server
+# xserver-config = Config file to pass to X server
+# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
+# 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)
+# 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
+# greeter-show-manual-login = True if the greeter should offer a manual login option
+# greeter-show-remote-login = True if the greeter should offer a remote login option
+# user-session = Session to load for users
+# 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)
+# greeter-setup-script = Script to run when starting a greeter (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
+# autologin-session = Session to load for automatic login (overrides user-session)
+# exit-on-failure = True if the daemon should exit if this seat fails
+#
+[SeatDefaults]
+#type=xlocal
+#xserver-command=X
+#xserver-layout=
+#xserver-config=
+#xserver-allow-tcp=false
+#xdmcp-manager=
+#xdmcp-port=177
+#xdmcp-key=
+greeter-session=lightdm-gtk-greeter
+#greeter-hide-users=false
+#greeter-allow-guest=true
+#greeter-show-manual-login=false
+#greeter-show-remote-login=true
+#user-session=default
+#allow-guest=true
+#guest-session=UNIMPLEMENTED
+#session-wrapper=lightdm-session
+#display-setup-script=
+#greeter-setup-script=
+#session-setup-script=
+#session-cleanup-script=
+#autologin-guest=false
+#autologin-user=
+#autologin-user-timeout=0
+#autologin-session=UNIMPLEMENTED
+#exit-on-failure=false
+
+#
+# Seat configuration
+#
+# Each seat must start with "Seat:".
+# Uses settings from [SeatDefaults], any of these can be overriden by setting them in this section.
+#
+#[Seat:0]
+
+#
+# XDMCP Server configuration
+#
+# enabled = True if XDMCP connections should be allowed
+# port = UDP/IP port to listen for connections on
+# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
+#
+# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
+# it can be a word and the first 7 characters are used as the key.
+#
+[XDMCPServer]
+#enabled=false
+#port=177
+#key=
+
+#
+# VNC Server configuration
+#
+# enabled = True if VNC connections should be allowed
+# port = TCP/IP port to listen for connections on
+#
+[VNCServer]
+#enabled=false
+#port=5900
+#width=1024
+#height=768
+#depth=8
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/GdmGreeterTheme.desktop b/remote/tools/gtk-greeter/data/uni-legacy/GdmGreeterTheme.desktop
new file mode 100644
index 00000000..a9234c7f
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=theme.xml
+Name=Uni KDM theme
+Description=Uni Theme based on Daemonic KDM theme for FreeBSD
+Author=aceph <aceph@ventcore.net> and modified by MJanc
+Copyright=Creative Commons
+Screenshot=screenshot.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/KdmGreeterTheme.desktop b/remote/tools/gtk-greeter/data/uni-legacy/KdmGreeterTheme.desktop
new file mode 100644
index 00000000..36242be4
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=theme.xml
+Name=Uni KDM theme
+Description=Uni Theme based on Daemonic KDM theme for FreeBSD
+Author=aceph <aceph@ventcore.net> and modified by MJanc
+Copyright=Creative Commons
+Screenshot=screenshot.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/color.png b/remote/tools/gtk-greeter/data/uni-legacy/color.png
new file mode 100644
index 00000000..c2e998e5
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/color.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/enter.png b/remote/tools/gtk-greeter/data/uni-legacy/enter.png
new file mode 100644
index 00000000..b646e851
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/enter.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/enter_inactive.png b/remote/tools/gtk-greeter/data/uni-legacy/enter_inactive.png
new file mode 100644
index 00000000..e12cfb8e
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/enter_inactive.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/environment.png b/remote/tools/gtk-greeter/data/uni-legacy/environment.png
new file mode 100644
index 00000000..b9682822
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/environment.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/main-runner.png b/remote/tools/gtk-greeter/data/uni-legacy/main-runner.png
new file mode 100644
index 00000000..5b3cf656
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/main-runner.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/rz-logo.png b/remote/tools/gtk-greeter/data/uni-legacy/rz-logo.png
new file mode 100644
index 00000000..08ec2fe8
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/rz-logo.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/sessions.png b/remote/tools/gtk-greeter/data/uni-legacy/sessions.png
new file mode 100644
index 00000000..00d05f29
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/sessions.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/sessions_inactive.png b/remote/tools/gtk-greeter/data/uni-legacy/sessions_inactive.png
new file mode 100644
index 00000000..86bbe642
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/sessions_inactive.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/system.png b/remote/tools/gtk-greeter/data/uni-legacy/system.png
new file mode 100644
index 00000000..f7b9e71f
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/system.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/system_inactive.png b/remote/tools/gtk-greeter/data/uni-legacy/system_inactive.png
new file mode 100644
index 00000000..c3e1719b
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/system_inactive.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/theme.xml b/remote/tools/gtk-greeter/data/uni-legacy/theme.xml
new file mode 100644
index 00000000..1ffe1207
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/theme.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+	<!-- main pic, login pic -->
+	<item type="pixmap">
+		<normal file="color.png"/>
+		<pos x="0" y="0" width="100%" height="100%"/>
+		<item type="rect">
+			<normal color="#000000" alpha="0.0"/>
+			<pos anchor="n" x="50%" y="0" width="100%" height="40%"/>
+			
+			<item type="pixmap">
+				<normal file="welcome-time-shadowed.png"/>
+				<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
+				
+				<!-- Welcome on ... -->
+				<item type="label">
+					<pos anchor="w" x="5%" y="33%"/>
+					<normal color="#f0f0f0" font="Sans 12"/>
+					<!-- <stock type="welcome-label"/> -->
+					<text>OpenSLX Workstation (%h)</text>
+				</item>
+				
+				<!-- clock -->
+				<item type="label" id="clock">
+					<normal color="#f0f0f0" font="Sans 12"/>
+					<pos anchor="e" x="95%" y="33%"/>
+					<text>%c</text>
+				</item>
+				
+			</item>
+			
+			<item type="pixmap">
+				<normal file="uni-logo.png"/>
+				<pos anchor="n" x="50%" y="30%" height="50%"/>
+			</item>
+			
+		</item>
+		
+		<item type="pixmap">
+			<normal file="main-runner.png"/>
+			<pos anchor="c" x="50%" y="50%" width="100%" height="160"/>
+			
+			<item type="rect">
+				<normal color="#000000" alpha="0.0"/>
+				<pos anchor="w" x="0" y="50%" width="35%" height="100%"/>
+				
+				<item type="rect">
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="w" x="0" y="50%" width="120" height="100%"/>
+					<item type="pixmap">
+						<normal file="rz-logo.png"/>
+						<pos anchor="e" x="100%" y="50%"/>
+					</item>
+				</item>
+				
+				<item type="rect">
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="e" x="-140" y="50%" width="100%" height="100%"/>
+					
+					<!-- username-label -->
+					<item type="label">
+						<pos anchor="e" x="-5" y="40%"/>
+						<normal color="#f0f0f0" font="Sans 11"/>
+						<stock type="username-label"/>
+					</item>
+					
+					<!-- password-label -->
+					<item type="label">
+						<pos anchor="e" x="-5" y="60%"/>
+						<normal color="#f0f0f0" font="Sans 11"/>
+						<stock type="password-label"/>
+					</item>
+					
+				</item>
+				
+				<item type="rect">
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="e" x="100%" y="50%" width="140" height="100%"/>
+					
+					<!-- username-entry -->
+					<item type="entry" id="user-entry">
+						<pos anchor="w" x="0" y="40%" height="22" width="114"/>
+					</item>
+					
+					<!-- password-entry -->
+					<item type="entry" id="pw-entry">
+						<pos anchor="w" x="0" y="60%" height="22" width="114"/>
+					</item>
+					
+					<item type="pixmap" button="true" id="login_button">
+						<pos anchor="e" x="100%" y="60%" height="22" width="22"/>
+						<normal file="enter_inactive.png"/>
+						<prelight file="enter.png"/>
+					</item>
+					
+				</item>
+				
+			</item>
+			
+			<item type="rect">
+				<normal color="#ff0000" alpha="0.0"/>
+				<pos anchor="c" x="50%" y="50%" width="30%" height="160"/>
+				
+				<!-- capslock-warning -->
+				<item type="pixmap" id="caps-lock-warning">
+					<normal file="error.png"/>
+					<pos anchor="c" x="50%" y="22" width="100%" height="70"/>
+					<item type="rect" id="caps-lock-warning">
+						<normal color="#000000" alpha="0.4"/>
+						<pos anchor="c" x="50%" y="50%" width="100%" height="box"/>
+						<box orientation="vertical" xpadding="10" ypadding="5" spacing="0">
+							<item type="label">
+								<normal color="#ff8b00" font="Sans 11"/>
+								<pos x="50%" anchor="n"/>
+								<stock type="caps-lock-warning"/>
+							</item>
+						</box>
+					</item>
+				</item>
+				
+				<item type="pixmap">
+					<normal file="environment.png"/>
+					<pos anchor="c" x="50%" y="50%" width="186" height="100"/>
+				</item>
+				
+				<!-- Login-Error -->
+				<item type="pixmap" id="pam-error">
+					<normal file="error.png"/>
+					<pos anchor="c" x="50%" y="-22" width="100%" height="70"/>
+					<item type="rect">
+						<normal color="#000000" alpha="0.4"/>
+						<pos anchor="c" x="50%" y="50%" width="100%" height="box"/>
+						<box orientation="vertical" xpadding="10" ypadding="5" spacing="0">
+							<item type="label">
+								<normal color="#ff8b00" font="Sans 11"/>
+								<pos anchor="n" x="50%"/>
+								<text>Login failed!</text>
+								<text xml:lang="en">Login failed!</text>
+								<text xml:lang="de">Login fehlgeschlagen!</text>
+							</item>
+						</box>
+					</item>
+				</item>
+				
+			</item>
+			
+			<!-- icons and text on the left -->
+			<item type="rect">
+				<normal color="#000000" alpha="0.0"/>
+				<pos anchor="e" x="100%" y="50%" width="35%" height="100%"/>
+				
+				<!-- session-button -->
+				<item type="rect" id="session_button" button="true">
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="se" x="80%" y="50%" width="160" height="50%"/>
+					
+					<item type="pixmap" id="session_button" button="true">
+						<normal file="sessions_inactive.png"/>
+						<prelight file="sessions.png"/>
+						<pos anchor="se" x="94%" y="-8" width="48" height="48"/>
+					</item>
+					
+					<item type="label">
+						<normal color="#bbbbbb" font="Sans 11"/>
+						<prelight color="#f0f0f0" font="Sans 11"/>
+						<active color="#ff8b00" font="Sans 11"/>
+						<pos anchor="e" x="-70" y="-32"/>
+						<text>Session</text>
+						<text xml:lang="en">Session</text>
+						<text xml:lang="de">Sitzung</text>
+					</item>
+					
+				</item>
+				
+				<!-- menu-button -->
+				<item type="rect" id="system_button" button="true">
+					<show modes="console" type="system"/>
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="ne" x="80%" y="50%" width="160" height="50%"/>
+					<item type="pixmap" id="system_button" button="true">
+						<normal file="system_inactive.png"/>
+						<prelight file="system.png"/>
+						<pos anchor="ne" x="94%" y="8" width="48" height="48"/>
+					</item>
+					<item type="label">
+						<normal color="#bbbbbb" font="Sans 11"/>
+						<prelight color="#f0f0f0" font="Sans 11"/>
+						<active color="#ff8b00" font="Sans 11"/>
+						<pos anchor="e" x="-70" y="32"/>
+						<text>System Menu</text>
+						<text xml:lang="en">System Menu</text>
+						<text xml:lang="de">System Menü</text>
+					</item>
+				</item>
+				
+			</item>
+			
+		</item>
+        <!--
+        <item type="label">
+            <pos anchor="nw" x="1%" y="97%"/>
+            <normal color="#f0f0f0" font="Sans 14"/>
+            <text>Auf diesem Rechner werden Berechnungen im Hintergrund duchgeführt (Rosetta@home). Bei Problemem kann Neustart erfolgen (3-5 Sek. Power-Button drücken)</text>
+        </item>
+        -->
+	</item>
+</greeter>
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/uni-logo.png b/remote/tools/gtk-greeter/data/uni-legacy/uni-logo.png
new file mode 100644
index 00000000..45cef30e
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/uni-logo.png
diff --git a/remote/tools/gtk-greeter/data/uni-legacy/welcome-time-shadowed.png b/remote/tools/gtk-greeter/data/uni-legacy/welcome-time-shadowed.png
new file mode 100644
index 00000000..8fd4fa65
--- /dev/null
+++ b/remote/tools/gtk-greeter/data/uni-legacy/welcome-time-shadowed.png
diff --git a/remote/tools/gtk-greeter/gtk-greeter.build b/remote/tools/gtk-greeter/gtk-greeter.build
new file mode 100644
index 00000000..240fdafc
--- /dev/null
+++ b/remote/tools/gtk-greeter/gtk-greeter.build
@@ -0,0 +1,37 @@
+#tool/distro specific functions for fetching, building and installing dependencies
+
+fetch_source () {
+	if [ ! -e .fetched_source ]; then
+ 		[ ! -d src ] && mkdir src
+		wget $URL
+		tar xfz $VERSION.tar.gz -C src/
+		rm $VERSION.tar.gz
+		touch .fetched_source
+	fi
+}	
+
+install_dependencies() {
+	apt-get install -y $DEPS
+}
+
+build () {
+	BUILDDIR=$TOOL_DIR/$TOOL/build
+
+	if [ ! -e .built ]; then
+		cd src/$VERSION
+		./configure --prefix=/
+		make 
+		[ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
+		DESTDIR=$BUILDDIR make install
+
+		cd -
+		touch .built
+
+	fi
+}
+
+post_copy() {
+	#copy lightdm.conf from data
+	[ ! -d ${INIT_DIR}/etc/lightdm ] && mkdir -p ${INIT_DIR}/etc/lightdm  
+	cp ${TOOL_DIR}/${TOOL}/data/lightdm.conf ${INIT_DIR}/etc/lightdm
+}
diff --git a/remote/tools/gtk-greeter/gtk-greeter.conf b/remote/tools/gtk-greeter/gtk-greeter.conf
new file mode 100644
index 00000000..f6110f0d
--- /dev/null
+++ b/remote/tools/gtk-greeter/gtk-greeter.conf
@@ -0,0 +1,7 @@
+VERSION=lightdm-gtk-greeter-1.3.1
+URL=https://launchpad.net/lightdm-gtk-greeter/1.4/1.3.1/+download/lightdm-gtk-greeter-1.3.1.tar.gz
+DEPS="gtk+-3.0"
+REQUIRED_PACKAGES=""
+REQUIRED_BINARIES="lightdm-gtk-greeter"
+REQUIRED_DIRECTORIES="/share"
+REQUIRED_FILES="/etc/lightdm/lightdm-gtk-greeter.conf"
diff --git a/remote/tools/ldm/ldm.build b/remote/tools/ldm/ldm.build
index f8860806..1a5ad082 100644
--- a/remote/tools/ldm/ldm.build
+++ b/remote/tools/ldm/ldm.build
@@ -15,13 +15,39 @@ install_dependencies() {
 }
 
 build () {
+	BUILDDIR=$TOOL_DIR/$TOOL/build
+
 	if [ ! -e .built ]; then
 		cd src/$VERSION
 		./configure --prefix=/
 		make 
-		[ ! -d $TOOL_DIR/$TOOL/build ] && mkdir -p $TOOL_DIR/$TOOL/build
-		DESTDIR=$TOOL_DIR/$TOOL/build make install
+		[ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
+		DESTDIR=$BUILDDIR make install
+
+		COPYLIST="list_dpkg_output"
+		[ -e $COPYLIST ] && rm $COPYLIST
+
+		for PACKAGE in ${REQUIRED_PACKAGES} 
+		do
+			for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man)
+			 do
+				[ ! -d $FILE ] && echo $FILE >> $COPYLIST
+			 done
+		done
+		
+		#prepare target dir & copy there
+        [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
+		tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR
+
 		cd -
-	touch .built
+		touch .built
+
 	fi
 }
+
+post_copy() {
+	[ ! -d ${INIT_DIR}/var/lib/lightdm ] && mkdir -p ${INIT_DIR}/var/lib/lightdm
+	touch ${INIT_DIR}/var/lib/lightdm/.Xauthority
+	chown -R lightdm:lightdm ${INIT_DIR}/var/lib/lightdm/
+}
+
diff --git a/remote/tools/ldm/ldm.conf b/remote/tools/ldm/ldm.conf
index d1dc4eff..f6b9004a 100644
--- a/remote/tools/ldm/ldm.conf
+++ b/remote/tools/ldm/ldm.conf
@@ -1,7 +1,8 @@
 VERSION=lightdm-1.4.0
 URL=https://launchpad.net/lightdm/1.4/1.4.0/+download/lightdm-1.4.0.tar.gz
 DEPS="libpam-dev itstool liblightdm-gobject-1-dev"
+REQUIRED_PACKAGES=""
 REQUIRED_BINARIES="dm-tool lightdm gdmflexiserver lightdm-guest-session-wrapper lightdm-set-defaults"
 REQUIRED_DIRECTORIES="/etc /lib"
-REQUIRED_FILES="
+REQUIRED_FILES=""
 
diff --git a/remote/tools/xorg/xorg.build b/remote/tools/xorg/xorg.build
index 800e243d..5eaff345 100644
--- a/remote/tools/xorg/xorg.build
+++ b/remote/tools/xorg/xorg.build
@@ -31,5 +31,7 @@ build() {
 
 post_copy() {
 	[ ! -d $INIT_DIR/etc/X11 ] && mkdir -p $INIT_DIR/etc/X11
-	ln -s $INIT_DIR/usr/bin/Xorg $INIT_DIR/etc/X11/X
+	ln -s /usr/bin/Xorg ${INIT_DIR}/etc/X11/X	
+	[ ! -d $INIT_DIR/var/lib/xkb ] && mkdir -p $INIT_DIR/var/lib/xkb
+	cp /var/lib/xkb/server* $INIT_DIR/var/lib/xkb
 }
diff --git a/remote/tools/xorg/xorg.conf b/remote/tools/xorg/xorg.conf
index 84f8b5bb..cb2aefa2 100644
--- a/remote/tools/xorg/xorg.conf
+++ b/remote/tools/xorg/xorg.conf
@@ -1,5 +1,11 @@
 REQUIRED_PACKAGES=" xserver-xorg
 					xserver-xorg-core
+					libgl1-mesa-dri
+					xkb-data
+					x11-xkb-utils
+					xserver-xorg-input-evdev
+					xserver-xorg-input-mouse
+					xserver-xorg-input-vmmouse
 					xserver-xorg-video-intel
 					xserver-xorg-video-openchrome     
 					xserver-xorg-video-savage         
@@ -22,6 +28,6 @@ REQUIRED_PACKAGES=" xserver-xorg
 					xserver-xorg-video-nouveau        
 					xserver-xorg-video-s3             
 					xserver-xorg-video-tdfx"   
-REQUIRED_BINARIES="	Xorg vmwarectrl gtf cvt X "
-REQUIRED_DIRECTORIES="/lib/udev /usr/lib /usr/share/X11/xorg.conf.d"
+REQUIRED_BINARIES="	Xorg vmwarectrl gtf cvt X xkbcomp xkbvleds xkbprint setxkbmap xkbwatch xkbbell xkbevd vmmouse_detect"
+REQUIRED_DIRECTORIES="/lib/udev /usr/lib /usr/share/X11 /usr/lib/i386-linux-gnu/dri"
 REQUIRED_FILES=""