7 files changed, 39 insertions, 22 deletions
diff --git a/remote/modules/openstack/module.conf b/remote/modules/openstack/module.conf
index 8912f439..0cd03752 100644
--- a/remote/modules/openstack/module.conf
+++ b/remote/modules/openstack/module.conf
@@ -1,6 +1,3 @@
-REQUIRED_CONTENT_PACKAGES=""
-REQUIRED_INSTALLED_PACKAGES=""
-
 REQUIRED_BINARIES=""
 REQUIRED_LIBRARIES=""
 REQUIRED_DIRECTORIES=""
diff --git a/remote/modules/openstack/module.conf.ubuntu.14.04 b/remote/modules/openstack/module.conf.ubuntu.14.04
new file mode 100644
index 00000000..7c24b4a9
--- /dev/null
+++ b/remote/modules/openstack/module.conf.ubuntu.14.04
@@ -0,0 +1,9 @@
+REQUIRED_INSTALLED_PACKAGES="
+	neutron-common
+	neutron-plugin-ml2
+	neutron-plugin-openvswitch-agent
+	nova-compute-kvm
+	python-guestfs
+	python-mysqldb
+"
+REQUIRED_CONTENT_PACKAGES="$REQUIRED_INSTALLED_PACKAGES"
diff --git a/remote/onetime-fixes/install-xfce4-greybird-theme b/remote/onetime-fixes/install-xfce4-greybird-theme
index fd9a0819..6c1251a3 100755
--- a/remote/onetime-fixes/install-xfce4-greybird-theme
+++ b/remote/onetime-fixes/install-xfce4-greybird-theme
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+if ! which startxfce4 ; then
+	# xfce4 not installed, TODO install?
+	echo "Could not find 'startxfce4'. Is it installed?"
+	exit 1
+fi
+
 # first download the greybird theme
 if wget https://github.com/shimmerproject/Greybird/tarball/master -O /tmp/greybird.tgz ; then
 
diff --git a/scripts/kopt2mod b/scripts/kopt2mod
new file mode 100755
index 00000000..8eb540e4
--- /dev/null
+++ b/scripts/kopt2mod
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+[ $# -ne 1 ] && echo "Usage: ./kopt2mod <kernel_source_dir>" && exit 1
+
+FILES=$(find $1 -name Kconfig)
+
+for file in $FILES; do
+	CURRENT=
+	while read line; do
+		if [[ "$line" =~ ^(config|menuconfig) ]]; then
+			CURRENT=$(awk '{print $2}' <<<$line)
+			continue
+		fi
+		[ -z "$CURRENT" ] && continue
+		MOD="$(echo "$line" | grep -o -E "called [a-z0-9_\-]+\." | awk '{print $2}')ko"
+		[[ "$MOD" == "ko" ]] && continue
+		echo "$CURRENT activates $(dirname $file)/$MOD"
+		CURRENT=
+	done < "$file"
+done
+
diff --git a/scripts/pam_scripts_ses_close.ugly_ses_close b/scripts/pam_scripts_ses_close.ugly_ses_close
deleted file mode 100755
index eedb40ed..00000000
--- a/scripts/pam_scripts_ses_close.ugly_ses_close
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin"
-
-[ ! -z "$SLX_DEBUG" ] && echo "[$PAM_TYPE] Closing session for $PAM_USER"
-
-# TODO check if its the last session of the user.
-
-OPENSESSIONS=$(loginctl|grep $PAM_USER|wc -l)
-
-echo "User $PAM_USER has $OPENSESSIONS open sessions."
-
-if [ "x$OPENSESSIONS" == "x1" ]; then
-	# assume its last session, start watchdog in background
-	echo "Last session beeing closed..."
-	( while true; do sleep 1; if [ "x$(loginctl |grep $PAM_USER)" == "x" ]; then [ $(id -g $PAM_USER) -ge 1000 ] && umount /home/s8jobaue; fi; done) &
-fi
-
-[ $(id -g $PAM_USER) -ge 1000 ] && umount /home/$PAM_USER
diff --git a/server/blacklists/desktop-sessions/no-dual-head b/server/blacklists/desktop-sessions/no-dual-head
new file mode 100644
index 00000000..d82fcc62
--- /dev/null
+++ b/server/blacklists/desktop-sessions/no-dual-head
@@ -0,0 +1,2 @@
+- /usr/lib/unity-settings-daemon-1.0/libxrandr.so
+- /usr/lib/unity-settings-daemon-1.0/xrandr.gnome-settings-plugin
diff --git a/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix b/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix
new file mode 120000
index 00000000..c7444165
--- /dev/null
+++ b/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix
@@ -0,0 +1 @@
+../../modules/ubuntu-14.04-unity-panel-service-fix
+\ No newline at end of file