From 780445bbfcc320e7d0110cdaf01e7efd809ee90c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 4 Apr 2017 12:19:20 +0200
Subject: [run-virt] Try more mount options for CIFS, just like satellite
 server

---
 .../run-virt/data/opt/openslx/scripts/systemd-mount_vm_store | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'core/modules/run-virt/data/opt/openslx/scripts')

diff --git a/core/modules/run-virt/data/opt/openslx/scripts/systemd-mount_vm_store b/core/modules/run-virt/data/opt/openslx/scripts/systemd-mount_vm_store
index 235cf4be..58f01038 100755
--- a/core/modules/run-virt/data/opt/openslx/scripts/systemd-mount_vm_store
+++ b/core/modules/run-virt/data/opt/openslx/scripts/systemd-mount_vm_store
@@ -23,10 +23,18 @@ else
 	# starts with '//' -> assume CIFS
 	export USER="$SLX_VM_NFS_USER"
 	export PASSWD="$SLX_VM_NFS_PASSWD"
-	/opt/openslx/bin/timeout -t 10 -s 9 mount -v -t cifs -o ro,file_mode=0644,dir_mode=0755,uid=0,gid=0,forceuid,forcegid,sec=ntlm,nounix "$SLX_VM_NFS" /mnt/vmstore
+	for vers in "" "3.0" "2.1" "1.0" "2.0"; do
+		[ -n "$vers" ] && vers=",vers=${vers}"
+		for sec in "" "ntlmssp" "ntlmv2" "ntlm"; do
+			[ -n "$sec" ] && sec=",sec=${sec}"
+			/opt/openslx/bin/timeout -t 10 -s 9 mount -v -t cifs -o "ro,file_mode=0644,dir_mode=0755,uid=0,gid=0,forceuid,forcegid,nounix${vers}${sec}" "$SLX_VM_NFS" /mnt/vmstore
+			RET=$?
+			[ "$RET" = "0" ] && break
+		done
+		[ "$RET" = "0" ] && break
+	done
 	unset USER
 	unset PASSWD
-	RET=$?
 fi > "$OUTFILE" 2>&1
 
 if [ "$RET" -ne "0" ]; then
-- 
cgit v1.2.3-55-g7522