[run-virt] More progress on openslx.exe

3 files changed, 27 insertions, 7 deletions

diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
index d1343700..2fdebf4c 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
@@ -14,9 +14,26 @@ mkfs.fat "${FLOPPYIMG}" || mkfs.vfat "${FLOPPYIMG}" || mkdosfs "${FLOPPYIMG}"
 # via virtual floppy
 #mcopy -i "${FLOPPYIMG}" "$xmlfile" "::/config.xml"
 
-# Create file with resolution information
-xrandr | grep -o -E 'connected\s*(primary)?\s*[0-9]+x[0-9]+\+0\+0' \
-	| grep -o -E -m1 '[0-9]+x[0-9]+' > "${TMPDIR}/hostres.txt"
+# Create file with resolution information etc.
+. "/opt/openslx/inc/shares"
+[ -z "$SHARE_REMAP_MODE" ] && SHARE_REMAP_MODE="1"
+[ -z "$SHARE_CREATE_MISSING_REMAP" ] && SHARE_CREATE_MISSING_REMAP="1"
+RESOLUTION=$(xrandr | grep -o -E 'connected\s*(primary)?\s*[0-9]+x[0-9]+\+0\+0' \
+	| grep -o -E -m1 '[0-9]+x[0-9]+')
+
+cat > "${TMPDIR}/geraffel.ini" <<-HIER
+[openslx]
+resolution=${RESOLUTION}
+createMissingRemap=${SHARE_CREATE_MISSING_REMAP}
+remapMode=${SHARE_REMAP_MODE}
+
+[remap]
+documents=${SHARE_DOCUMENTS}
+downloads=${SHARE_DOWNLOADS}
+desktop=${SHARE_DESKTOP}
+media=${SHARE_MEDIA}
+other=${SHARE_OTHER}
+HIER
 
 # Create file for network shares to mount
 SHARES="${TMPDIR}/shares.dat"
@@ -36,8 +53,9 @@ if pwdaemon --query "${TMPHOME}/.pwsocket" > "${SHARES}"; then
 fi
 
 # Copy all them files into floppy image
-mcopy -i "${FLOPPYIMG}" "${TMPDIR}/hostres.txt" "::/"
+mcopy -i "${FLOPPYIMG}" "${TMPDIR}/geraffel.ini" "::/"
 mcopy -i "${FLOPPYIMG}" "$VMCHOOSER_DIR/data/openslx.exe" "::/"
 mcopy -i "${FLOPPYIMG}" "${SHARES}" "::/"
+rm -f -- "${SHARES}"
 unset SHARES VAR NETHOME
 
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials b/remote/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials
index 1e2c18e7..a03d8886 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials
@@ -18,17 +18,19 @@ if [ -n "$TEMP_HOME_DIR" ]; then
 		[ -z "$XUSER" ] && XUSER="${PAM_USER}"
 		# Guess domain
 		XDOMAIN=
-		if [ -n "$PERSISTENT_OK" ]; then
+		if [ -n "$PERSISTENT_HOME_DIR" ]; then
 			XDOMAIN=$(grep -F " ${PERSISTENT_HOME_DIR} " "/proc/mounts" | grep -m1 -F 'domain=' | sed -r 's/^.*[ ,]domain=([^ ,]+)[ ,].*$/\1/g')
 		fi
 		if [ -z "$XDOMAIN" ]; then
-			XDOMAIN=$(grep -m1 -i '^BASE\s*DC=' "/etc/ldap.conf" | sed -r 's/^BASE\s*DC=([^,;]+)[,;].*$/\1/I')
+			XDOMAIN=$(grep -m1 -i '^BASE\s*DC=' "/etc/ldap.conf" | sed -r 's/^BASE\s*DC=([^,;]+).*$/\1/I')
 		fi
 		if [ -z "$XDOMAIN" ]; then
-			XDOMAIN=$(grep -m1 -i '^ldap_search_base\s*=' "/etc/sssd/sssd.conf" | sed -r 's/^ldap_search_base\s*=\s*DC=([^,;]+)[,;].*$/\1/I')
+			XDOMAIN=$(grep -m1 -i '^ldap_search_base\s*=\s*DC=' "/etc/sssd/sssd.conf" | sed -r 's/^ldap_search_base\s*=\s*DC=([^,;]+).*$/\1/I')
 		fi
 		if [ -n "$XDOMAIN" ]; then
 			XDOMAIN=$(echo "$XDOMAIN" | tr '[a-z]' '[A-Z]')
+		else
+			XDOMAIN="WORKGROUP"
 		fi
 		USERNAME="$XDOMAIN\\$XUSER" PASSWORD="$PAM_AUTHTOK" PWSOCKET="${TEMP_HOME_DIR}/.pwsocket" su -c 'pwdaemon --daemon &' "${PAM_USER}" &
 		unset XUSER XDOMAIN
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
index 39928c92..7b71ba90 100755
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe