merge with latest dev version

15 files changed, 706 insertions, 0 deletions

diff --git a/core/modules/xorg/data/etc/X11/Xreset b/core/modules/xorg/data/etc/X11/Xreset
new file mode 100755
index 00000000..3d175a5b
--- /dev/null
+++ b/core/modules/xorg/data/etc/X11/Xreset
@@ -0,0 +1,25 @@
+#!/bin/ash
+#
+# /etc/X11/Xreset
+#
+# Xreset - run as root after session exits
+#
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin"
+
+set -e
+
+PROGNAME=Xreset
+SYSSESSIONDIR=/etc/X11/Xreset.d
+
+if [ ! -d "$SYSSESSIONDIR" ]; then
+  # Nothing to do, exiting
+  exit 0
+fi
+
+for SESSIONFILE in $SYSSESSIONDIR/*; do
+	. "$SESSIONFILE" || slxlog "xreset" "Xreset: Could not source $SESSIONFILE." "$SESSIONFILE" 
+done
+
+exit 0
+
diff --git a/core/modules/xorg/data/etc/X11/Xsession b/core/modules/xorg/data/etc/X11/Xsession
new file mode 100755
index 00000000..fadc69ba
--- /dev/null
+++ b/core/modules/xorg/data/etc/X11/Xsession
@@ -0,0 +1,112 @@
+#!/bin/ash
+#
+# /etc/X11/Xsession
+#
+# Xsession is executed to start the user's session (as the user)
+# 
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin"
+
+PROGNAME=Xsession
+
+message () {
+  # pretty-print messages of arbitrary length; use xmessage if it
+  # is available and $DISPLAY is set
+  MESSAGE="$PROGNAME: $*"
+  echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2
+  if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
+    echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
+  fi
+}
+
+message_nonl () {
+  # pretty-print messages of arbitrary length (no trailing newline); use
+  # xmessage if it is available and $DISPLAY is set
+  MESSAGE="$PROGNAME: $*"
+  echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2;
+  if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
+    echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
+  fi
+}
+
+errormsg () {
+  # exit script with error
+  message "$*"
+  exit 1
+}
+
+internal_errormsg () {
+  # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message
+  # One big call to message() for the sake of xmessage; if we had two then
+  # the user would have dismissed the error we want reported before seeing the
+  # request to report it.
+  errormsg "$*" \
+           "Please report the installed version of the \"x11-common\"" \
+           "package and the complete text of this error message to" \
+           "<debian-x@lists.debian.org>."
+}
+
+# Workaround to start Xsession. The original Xsession script includes error handling functionality and sources other scrips from the Xsession.d/ directory.
+
+SESSIONDIR="/etc/X11/Xsession.d"
+
+if [ -d "$SESSIONDIR" ]; then
+	for file in $SESSIONDIR/*; do
+		. $file || slxlog "xsession" "Xsession: Could not source $file" "$file"
+	done
+fi
+
+# Make sure we source the global profile - needed for ssh-agent, etc.
+[ -e "/etc/profile" ] && source "/etc/profile"
+
+# start selected session
+case "$1" in
+	failsafe)
+		# Failsafe session was requested.
+		if [ -e /usr/bin/xterm ]; then
+			if [ -x /usr/bin/xterm ]; then
+				exec xterm -geometry +1+1
+			else
+				# fatal error
+				errormsg "unable to launch failsafe X session ---" \
+					"x-terminal-emulator not executable; aborting."
+			fi
+		else
+			# fatal error
+			errormsg "unable to launch failsafe X session ---" \
+				"x-terminal-emulator not found; aborting."
+		fi
+	;;
+	default)
+		# Specific program was requested.
+		SESSION="default"
+		if [ -e $HOME/.dmrc ]; then
+			SESSION=$(cat $HOME/.dmrc|grep "Session"| cut -d "=" -f2)
+		fi
+		# somehow .dmrc is cleared when logging in the first time after boot
+		if [ -e $HOME/.dmrc.real ]; then
+			SESSION=$(cat $HOME/.dmrc.real|grep "Session"| cut -d "=" -f2)
+		fi
+		[ "x$SESSION" == "xdefault" ] && SESSION="gnome"
+		CMD=$(cat /opt/openslx/xsessions/$SESSION.desktop|grep "Exec"| cut -d "=" -f2-99|head -n1)
+		exec $CMD
+	;;
+
+	*)
+		# Specific program was requested.
+		STARTUP_FULL_PATH=$(/opt/openslx/bin/which "${1%% *}" || true)
+		if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
+			if [ -x "$STARTUP_FULL_PATH" ]; then
+				exec $1
+			else
+				message "unable to launch \"$1\" X session ---" \
+					"\"$1\" not executable; falling back to default session."
+			fi
+		else
+			message "unable to launch \"$1\" X session ---" \
+				"\"$1\" not found; falling back to default session."
+		fi
+	;;
+
+esac
+
diff --git a/core/modules/xorg/data/etc/X11/Xsetup b/core/modules/xorg/data/etc/X11/Xsetup
new file mode 100755
index 00000000..b93d7bd6
--- /dev/null
+++ b/core/modules/xorg/data/etc/X11/Xsetup
@@ -0,0 +1,16 @@
+#!/bin/ash
+#
+# /etc/X11/Xsetup
+#
+# Xsetup is executed once before the greeter starts (as root)
+# 
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin"
+
+SESSIONDIR="/etc/X11/Xsetup.d"
+
+if [ -d "$SESSIONDIR" ]; then
+	for file in $SESSIONDIR/*; do
+		. $file || slxlog "xsetup" "Xsetup: Could not source $file" "$file"
+	done
+fi
diff --git a/core/modules/xorg/data/etc/X11/Xstartup b/core/modules/xorg/data/etc/X11/Xstartup
new file mode 100755
index 00000000..353c5bb2
--- /dev/null
+++ b/core/modules/xorg/data/etc/X11/Xstartup
@@ -0,0 +1,9 @@
+#!/bin/ash
+#
+# /etc/X11/Xstartup
+#
+# Xstartup is executed on successful authentication, before the session is opened (as root)
+#
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" 
+
diff --git a/core/modules/xorg/data/opt/openslx/iptables/rules.d/70-xorg b/core/modules/xorg/data/opt/openslx/iptables/rules.d/70-xorg
new file mode 100755
index 00000000..023f5087
--- /dev/null
+++ b/core/modules/xorg/data/opt/openslx/iptables/rules.d/70-xorg
@@ -0,0 +1,4 @@
+#!/bin/ash
+
+# X11 port
+iptables -I ipt-helper-INPUT 1 -i br0 -p tcp --dport 6000 -j REJECT
diff --git a/core/modules/xorg/module.build b/core/modules/xorg/module.build
new file mode 100644
index 00000000..16e0bb5b
--- /dev/null
+++ b/core/modules/xorg/module.build
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+fetch_source() {
+	:
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+
+	# copy udev rules to correct location
+	[ -d "${MODULE_BUILD_DIR}/lib/udev" ] && mv "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/usr/lib/"	
+}
+
+post_copy() {
+	mkdir -p "${TARGET_BUILD_DIR}/etc/X11"
+	[ ! -e ${TARGET_BUILD_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${TARGET_BUILD_DIR}/etc/X11/X	
+}
+
diff --git a/core/modules/xorg/module.conf b/core/modules/xorg/module.conf
new file mode 100644
index 00000000..b99f0e2a
--- /dev/null
+++ b/core/modules/xorg/module.conf
@@ -0,0 +1,19 @@
+REQUIRED_BINARIES="
+			X
+			Xorg
+			gtf
+			cvt
+			setxkbmap
+			xkbvleds
+			xkbprint
+			xkbwatch
+			xkbbell
+			xkbevd
+			xrandr
+			xkbcomp
+			vmmouse_detect
+"
+REQUIRED_DIRECTORIES="
+			/usr/share/X11
+"
+REQUIRED_FILES=""
diff --git a/core/modules/xorg/module.conf.centos b/core/modules/xorg/module.conf.centos
new file mode 100644
index 00000000..ff5846e3
--- /dev/null
+++ b/core/modules/xorg/module.conf.centos
@@ -0,0 +1,67 @@
+# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse
+REQUIRED_INSTALLED_PACKAGES="
+			xorg-x11-server-Xorg
+			xorg-x11-drv-vmware
+			xorg-x11-drv-ati
+			xorg-x11-drv-nouveau
+			xorg-x11-drv-intel
+			xorg-x11-drv-vesa
+			xorg-x11-drv-fbdev
+			xorg-x11-drv-modesetting
+			xorg-x11-drv-vmmouse
+			xorg-x11-drv-wacom
+			xorg-x11-drv-evdev
+			xorg-x11-drv-keyboard
+			xorg-x11-drv-mouse
+			xorg-x11-drv-synaptics
+			xorg-x11-drv-void
+			xkeyboard-config
+			dejavu-sans-fonts
+			libxcb
+			mesa-dri-drivers
+			mesa-libGL
+			xorg-x11-xkb-utils
+			xorg-x11-xkb-extras
+			pixman
+			xorg-x11-server-utils
+"
+REQUIRED_CONTENT_PACKAGES="
+			xorg-x11-server-Xorg
+			xorg-x11-drv-vmware
+			xorg-x11-drv-ati
+			xorg-x11-drv-nouveau
+			xorg-x11-drv-intel
+			xorg-x11-drv-vesa
+			xorg-x11-drv-fbdev
+			xorg-x11-drv-modesetting
+			xorg-x11-drv-vmmouse
+			xorg-x11-drv-wacom
+			xorg-x11-drv-evdev
+			xorg-x11-drv-keyboard
+			xorg-x11-drv-mouse
+			xorg-x11-drv-synaptics
+			xorg-x11-drv-void
+			xkeyboard-config
+			dejavu-sans-fonts
+			libxcb
+			mesa-dri-drivers
+			mesa-libGL
+			xorg-x11-xkb-utils
+			xorg-x11-xkb-extras
+			pixman
+			xorg-x11-server-utils
+"
+REQUIRED_LIBRARIES="
+			libxcb-glx
+			libIntelXvMC
+			i965_dri
+			vmwgfx_dri
+			i915_dri
+			libpixman-1
+"
+REQUIRED_DIRECTORIES+="
+			/usr/bin
+			/usr/lib/udev
+			/usr/$LIB64/xorg
+			/usr/share/fonts
+"
diff --git a/core/modules/xorg/module.conf.debian b/core/modules/xorg/module.conf.debian
new file mode 100644
index 00000000..86d473a3
--- /dev/null
+++ b/core/modules/xorg/module.conf.debian
@@ -0,0 +1,40 @@
+REQUIRED_INSTALLED_PACKAGES="
+"
+REQUIRED_CONTENT_PACKAGES="	
+			xserver-xorg
+			xserver-xorg-core
+			libgl1-mesa-dri
+			libgl1-mesa-glx
+			xkb-data
+			x11-xkb-utils
+			x11-xserver-utils
+			xserver-xorg-input-evdev
+			xserver-xorg-input-mouse
+			xserver-xorg-input-vmmouse
+			xserver-xorg-video-intel
+			xserver-xorg-video-ati
+			xserver-xorg-video-vesa
+			xserver-xorg-video-mga
+			xserver-xorg-video-sisusb
+			xserver-xorg-video-vmware
+			xserver-xorg-video-fbdev
+			xserver-xorg-video-radeon
+			xserver-xorg-video-sisusb
+			xserver-xorg-video-nouveau
+			@xserver-xorg-video-openchrome
+			@xserver-xorg-video-savage
+			@xserver-xorg-video-trident
+			@xserver-xorg-video-mach64
+			@xserver-xorg-video-qxl
+			@xserver-xorg-video-siliconmotion
+			@xserver-xorg-video-cirrus
+			@xserver-xorg-video-r128
+			@xserver-xorg-video-neomagic
+			@xserver-xorg-video-geode
+			@xserver-xorg-video-s3
+			@xserver-xorg-video-tdfx
+"
+REQUIRED_DIRECTORIES+="
+			/usr/lib 
+"
+REQUIRED_FILES=""
diff --git a/core/modules/xorg/module.conf.fedora b/core/modules/xorg/module.conf.fedora
new file mode 100644
index 00000000..5cb5a594
--- /dev/null
+++ b/core/modules/xorg/module.conf.fedora
@@ -0,0 +1,69 @@
+# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse
+REQUIRED_INSTALLED_PACKAGES="
+			xorg-x11-server-Xorg
+			xorg-x11-drv-vmware
+			xorg-x11-drv-ati
+			xorg-x11-drv-nouveau
+			xorg-x11-drv-intel
+			xorg-x11-drv-i740
+			xorg-x11-drv-vesa
+			xorg-x11-drv-fbdev
+			xorg-x11-drv-modesetting
+			xorg-x11-drv-vmmouse
+			xorg-x11-drv-wacom
+			xorg-x11-drv-evdev
+			xorg-x11-drv-keyboard
+			xorg-x11-drv-mouse
+			xorg-x11-drv-synaptics
+			xorg-x11-drv-void
+			xkeyboard-config
+			dejavu-sans-fonts
+			libxcb
+			mesa-dri-drivers
+			mesa-libGL
+			xorg-x11-xkb-utils
+			xorg-x11-xkb-extras
+			pixman
+			xorg-x11-server-utils
+"
+REQUIRED_CONTENT_PACKAGES="
+			xorg-x11-server-Xorg
+			xorg-x11-drv-vmware
+			xorg-x11-drv-ati
+			xorg-x11-drv-nouveau
+			xorg-x11-drv-intel
+			xorg-x11-drv-i740
+			xorg-x11-drv-vesa
+			xorg-x11-drv-fbdev
+			xorg-x11-drv-modesetting
+			xorg-x11-drv-vmmouse
+			xorg-x11-drv-wacom
+			xorg-x11-drv-evdev
+			xorg-x11-drv-keyboard
+			xorg-x11-drv-mouse
+			xorg-x11-drv-synaptics
+			xorg-x11-drv-void
+			xkeyboard-config
+			dejavu-sans-fonts
+			libxcb
+			mesa-dri-drivers
+			mesa-libGL
+			xorg-x11-xkb-utils
+			xorg-x11-xkb-extras
+			pixman
+			xorg-x11-server-utils
+"
+REQUIRED_LIBRARIES="
+			libxcb-glx
+			libIntelXvMC
+			i965_dri
+			vmwgfx_dri
+			i915_dri
+			libpixman-1
+"
+REQUIRED_DIRECTORIES+="
+			/usr/bin
+			/usr/lib/udev
+			/usr/$LIB64/xorg
+			/usr/share/fonts
+"
diff --git a/core/modules/xorg/module.conf.opensuse b/core/modules/xorg/module.conf.opensuse
new file mode 100644
index 00000000..1e6f5ff1
--- /dev/null
+++ b/core/modules/xorg/module.conf.opensuse
@@ -0,0 +1,59 @@
+# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse
+REQUIRED_INSTALLED_PACKAGES="
+"
+REQUIRED_CONTENT_PACKAGES="
+			xorg-x11
+			xorg-x11-server
+			xorg-x11-driver-input
+			xorg-x11-driver-video
+			xorg-x11-driver-video-nouveau
+			xf86-video-vmware
+			xf86-video-ati
+			xf86-video-nv
+			xf86-video-intel
+			xf86-video-i128
+			xf86-video-geode
+			xf86-video-vesa
+			xf86-video-fbdev
+			xf86-video-modesetting
+			xf86-input-vmmouse
+			xf86-input-wacom
+			xf86-input-evdev
+			xf86-input-joystick
+			xf86-input-keyboard
+			xf86-input-mouse
+			xf86-input-synaptics
+			xf86-input-void
+			xkeyboard-config
+			xkbcomp
+			dejavu-fonts
+			libxcb-glx0
+			kdm-branding-openSUSE
+			Mesa
+			xkbutils
+			xkbprint
+			setxkbmap
+			xkbevd
+			libpixman-1-0
+			xrandr
+			vaapi-intel-driver
+"
+REQUIRED_LIBRARIES="
+			libI810XvMC
+			libxcb-glx
+			libIntelXvMC
+			i965_dri
+			vmwgfx_dri
+			i915_dri
+			i965_drv_video
+			libpixman-1
+"
+REQUIRED_DIRECTORIES+="
+			/usr/bin
+			/usr/lib/udev
+			/usr/$LIB64/xorg
+			/usr/share/fonts
+"
+REQUIRED_FILES="
+			/var/adm/fillup-templates/sysconfig.displaymanager-kdm
+"
diff --git a/core/modules/xorg/module.conf.opensuse.13.1 b/core/modules/xorg/module.conf.opensuse.13.1
new file mode 100644
index 00000000..6199ed15
--- /dev/null
+++ b/core/modules/xorg/module.conf.opensuse.13.1
@@ -0,0 +1,95 @@
+# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse
+REQUIRED_INSTALLED_PACKAGES="
+			xorg-x11
+			xorg-x11
+			xorg-x11-server
+			xorg-x11-driver-input
+			xorg-x11-driver-video
+			xorg-x11-driver-video-nouveau
+			xf86-video-vmware
+			xf86-video-ati
+			xf86-video-nv
+			xf86-video-intel
+			xf86-video-i128
+			xf86-video-geode
+			xf86-video-vesa
+			xf86-video-fbdev
+			xf86-video-modesetting
+			xf86-input-vmmouse
+			xf86-input-wacom
+			xf86-input-evdev
+			xf86-input-joystick
+			xf86-input-keyboard
+			xf86-input-mouse
+			xf86-input-synaptics
+			xf86-input-void
+			xkeyboard-config
+			xkbcomp
+			dejavu-fonts
+			libxcb-glx0
+			kdm-branding-openSUSE
+			Mesa
+			xkbutils
+			xkbprint
+			setxkbmap
+			xkbevd
+			libpixman-1-0
+			xrandr
+			vaapi-intel-driver
+"
+REQUIRED_CONTENT_PACKAGES="
+			xorg-x11
+			xorg-x11-server
+			xorg-x11-driver-input
+			xorg-x11-driver-video
+			xorg-x11-driver-video-nouveau
+			xf86-video-vmware
+			xf86-video-ati
+			xf86-video-nv
+			xf86-video-intel
+			xf86-video-i128
+			xf86-video-geode
+			xf86-video-vesa
+			xf86-video-fbdev
+			xf86-video-modesetting
+			xf86-input-vmmouse
+			xf86-input-wacom
+			xf86-input-evdev
+			xf86-input-joystick
+			xf86-input-keyboard
+			xf86-input-mouse
+			xf86-input-synaptics
+			xf86-input-void
+			xkeyboard-config
+			xkbcomp
+			dejavu-fonts
+			libxcb-glx0
+			kdm-branding-openSUSE
+			Mesa
+			xkbutils
+			xkbprint
+			setxkbmap
+			xkbevd
+			libpixman-1-0
+			xrandr
+			vaapi-intel-driver
+"
+REQUIRED_LIBRARIES="
+			libI810XvMC
+			libxcb-glx
+			libIntelXvMC
+			i965_dri
+			vmwgfx_dri
+			i915_dri
+			i965_drv_video
+			libpixman-1
+"
+REQUIRED_DIRECTORIES+="
+			/usr/bin
+			/usr/lib/udev
+			/usr/$LIB64/xorg
+			/usr/share/fonts
+"
+REQUIRED_FILES="
+			/var/adm/fillup-templates/sysconfig.displaymanager-kdm
+"
diff --git a/core/modules/xorg/module.conf.opensuse.13.2 b/core/modules/xorg/module.conf.opensuse.13.2
new file mode 100644
index 00000000..363ce3aa
--- /dev/null
+++ b/core/modules/xorg/module.conf.opensuse.13.2
@@ -0,0 +1,92 @@
+# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse
+REQUIRED_INSTALLED_PACKAGES="
+			xorg-x11
+			xorg-x11-server
+			xorg-x11-driver-input
+			xorg-x11-driver-video
+			xf86-video-nouveau
+			xf86-video-vmware
+			xf86-video-ati
+			xf86-video-nv
+			xf86-video-intel
+			xf86-video-i128
+			xf86-video-geode
+			xf86-video-vesa
+			xf86-video-fbdev
+			xf86-video-modesetting
+			xf86-input-vmmouse
+			xf86-input-wacom
+			xf86-input-evdev
+			xf86-input-joystick
+			xf86-input-keyboard
+			xf86-input-mouse
+			xf86-input-synaptics
+			xf86-input-void
+			xkeyboard-config
+			xkbcomp
+			dejavu-fonts
+			kdm-branding-openSUSE
+			Mesa
+			xkbutils
+			xkbprint
+			setxkbmap
+			xkbevd
+			libpixman-1-0
+			xrandr
+			vaapi-intel-driver
+"
+REQUIRED_CONTENT_PACKAGES="
+			xorg-x11
+			xorg-x11-server
+			xorg-x11-driver-input
+			xorg-x11-driver-video
+			xf86-video-nouveau
+			xf86-video-vmware
+			xf86-video-ati
+			xf86-video-nv
+			xf86-video-intel
+			xf86-video-i128
+			xf86-video-geode
+			xf86-video-vesa
+			xf86-video-fbdev
+			xf86-video-modesetting
+			xf86-input-vmmouse
+			xf86-input-wacom
+			xf86-input-evdev
+			xf86-input-joystick
+			xf86-input-keyboard
+			xf86-input-mouse
+			xf86-input-synaptics
+			xf86-input-void
+			xkeyboard-config
+			xkbcomp
+			dejavu-fonts
+			libxcb-glx0
+			kdm-branding-openSUSE
+			Mesa
+			xkbutils
+			xkbprint
+			setxkbmap
+			xkbevd
+			libpixman-1-0
+			xrandr
+			vaapi-intel-driver
+"
+REQUIRED_LIBRARIES="
+			libxcb-glx
+			libIntelXvMC
+			i965_dri
+			vmwgfx_dri
+			i915_dri
+			i965_drv_video
+			libpixman-1
+"
+REQUIRED_DIRECTORIES+="
+			/usr/bin
+			/usr/lib/udev
+			/usr/$LIB64/xorg
+			/usr/share/fonts
+"
+REQUIRED_FILES="
+			/var/adm/fillup-templates/sysconfig.displaymanager-kdm
+"
diff --git a/core/modules/xorg/module.conf.ubuntu b/core/modules/xorg/module.conf.ubuntu
new file mode 100644
index 00000000..41a8739a
--- /dev/null
+++ b/core/modules/xorg/module.conf.ubuntu
@@ -0,0 +1,40 @@
+REQUIRED_INSTALLED_PACKAGES="
+"
+REQUIRED_CONTENT_PACKAGES="
+			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
+			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
+			libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
+			xkb-data
+			x11-xkb-utils
+			x11-xserver-utils
+			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-mga$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
+"
+
+REQUIRED_DIRECTORIES+="
+			/usr/lib
+"
+REQUIRED_FILES=""
diff --git a/core/modules/xorg/module.conf.ubuntu.16 b/core/modules/xorg/module.conf.ubuntu.16
new file mode 100644
index 00000000..8eb4cd56
--- /dev/null
+++ b/core/modules/xorg/module.conf.ubuntu.16
@@ -0,0 +1,37 @@
+REQUIRED_INSTALLED_PACKAGES="
+"
+REQUIRED_CONTENT_PACKAGES="
+			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
+			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
+			libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
+			xkb-data
+			x11-xkb-utils
+			x11-xserver-utils
+			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
+"
+
+REQUIRED_DIRECTORIES+="
+			/usr/lib
+"
+REQUIRED_FILES=""