Merge branch 'master' into installer

4 files changed, 4 insertions, 103 deletions

diff --git a/core/modules/pam-bwidm/data/opt/openslx/scripts/pam_bwidm b/core/modules/pam-bwidm/data/opt/openslx/scripts/pam_bwidm
index a22a115f..c43ed314 100755
--- a/core/modules/pam-bwidm/data/opt/openslx/scripts/pam_bwidm
+++ b/core/modules/pam-bwidm/data/opt/openslx/scripts/pam_bwidm
@@ -95,7 +95,7 @@ if ! [ -s "${IDP_QUERY_CACHE}" ]; then
 		echo "No IDP info cached, cache path not writable for current user."
 		exit 7
 	fi
-	idpret="$(curl -w "%{http_code}" -o "${IDP_QUERY_CACHE}" --connect-timeout 5 --max-time 15 "$IDP_QUERY_URL")"
+	idpret="$(curl --retry 3 --retry-connrefused --retry-delay 1 --retry-max-time 15 -w "%{http_code}" -o "${IDP_QUERY_CACHE}" --connect-timeout 2 --max-time 6 "$IDP_QUERY_URL")"
 	if [ "${#idpret}" != 3 ] || [ "x${idpret:0:1}" != "x2" ]; then
 		echo "Could not download the list of identity providers from '$IDP_QUERY_URL'. Aborting."
 		rm -f -- "$IDP_QUERY_CACHE"
diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth b/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth
index 9de61708..264e3c1e 100755
--- a/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth
+++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth
@@ -215,7 +215,7 @@ chown "${USER_UID}" "${TEMP_HOME_DIR}/WARNING.txt"
 
 # Remember for hooks in auth-slx-source.d
 if [ "${NETWORK_HOME:0:2}" = '//' ]; then
-	PERSISTENT_NETPATH=$(echo "$NETWORK_HOME" | tr '/' '\')
+	PERSISTENT_NETPATH=$(echo "$NETWORK_HOME" | tr '/' '\\')
 else
 	PERSISTENT_NETPATH="$NETWORK_HOME"
 fi
diff --git a/core/modules/xorg/module.conf.ubuntu b/core/modules/xorg/module.conf.ubuntu
index 4fbb0307..79316abe 100644
--- a/core/modules/xorg/module.conf.ubuntu
+++ b/core/modules/xorg/module.conf.ubuntu
@@ -26,10 +26,10 @@ REQUIRED_INSTALLED_PACKAGES="
 			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
 "
 REQUIRED_CONTENT_PACKAGES="
 			xterm
@@ -62,10 +62,10 @@ REQUIRED_CONTENT_PACKAGES="
 			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
diff --git a/core/modules/xorg/module.conf.ubuntu.17 b/core/modules/xorg/module.conf.ubuntu.17
deleted file mode 100644
index e5b76dad..00000000
--- a/core/modules/xorg/module.conf.ubuntu.17
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-			fonts-dejavu-core
-			fonts-dejavu-extra
-			ttf-dejavu-core
-			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
-			x11-utils
-			xdotool
-			libtxc-dxtn-s2tc
-			libinput10
-			libwacom2
-			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
-			libdrm-dev
-			libgbm-dev
-			libgl-dev
-			libgl1-mesa-dev
-			libudev-dev
-			pkg-config
-			x11proto-core-dev
-			x11proto-dri2-dev
-			x11proto-fonts-dev
-			x11proto-randr-dev
-			x11proto-render-dev
-			x11proto-video-dev
-			x11proto-xext-dev
-			x11proto-xf86dri-dev
-			xserver-xorg-dev
-			xutils-dev
-"
-REQUIRED_CONTENT_PACKAGES="
-			fonts-dejavu-core
-			fonts-dejavu-extra
-			ttf-dejavu-core
-			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
-			libegl1-mesa
-			libgbm1
-			libcapnp-0.5.3
-			libmirclient9
-			libwayland-client0
-			libwayland-server0
-			xkb-data
-			x11-xkb-utils
-			x11-xserver-utils
-			x11-utils
-			xdotool
-			libtxc-dxtn-s2tc
-			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-input-mouse$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
-"
-# TODO: Required because the shipped ones crash on VT switch as of 2017-11-24
-# Remove when fixed in ubuntu repos
-REQUIRED_XORG_DRIVERS="
-	xf86-video-ati//xf86-video-ati-18.0.1
-	xf86-video-amdgpu//xf86-video-amdgpu-18.0.1
-"
-REQUIRED_LIBRARIES+="
-	amdgpu_drv
-	radeon_drv
-	ati_drv
-"