From 857b834232a4e7aaec1e866ef504f03a42560d8e Mon Sep 17 00:00:00 2001
From: Raphael Dannecker <raphael.dannecker@steinbeisschule-reutlingen.de>
Date: Wed, 10 Dec 2025 14:34:01 +0100
Subject: [PATCH] Fix NETHOME detection issue for examusers, staff and parents

---
 roles/custom/fvs/files/lmn-patch-dolphin.sh | 11 ++++++++---
 roles/lmn_vm/files/vm-run                   | 11 ++++++++---
 roles/lmn_vm/files/vm-vminfo                |  9 ++++++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/roles/custom/fvs/files/lmn-patch-dolphin.sh b/roles/custom/fvs/files/lmn-patch-dolphin.sh
index fc3c0e7..ca7efc6 100755
--- a/roles/custom/fvs/files/lmn-patch-dolphin.sh
+++ b/roles/custom/fvs/files/lmn-patch-dolphin.sh
@@ -16,11 +16,16 @@ fi
 id="$(grep ID "$file" | sed -E "s|^.+ID>([[:digit:]]+)/([[:digit:]]+)</ID.+$|\1:\2|" \
 	    | sort -n -t: -k2 | tail -1 )"
 
-if id | grep -q teachers; then
-  NETHOME=/srv/samba/schools/default-school/teachers/$USER
-else
+for dir in teachers examusers staff parents; do
+  if [[ -d "/srv/samba/schools/default-school/${dir}/${USER}" ]]; then
+    NETHOME="/srv/samba/schools/default-school/${dir}/${USER}"
+    break
+  fi
+done
+if [[ -z "${NETHOME+x}" ]]; then
   NETHOME=(/srv/samba/schools/default-school/students/*/"$USER")
 fi
+
 [[ -d $NETHOME ]] || exit 0
 
 IDENTITY="${id%%:*}"
diff --git a/roles/lmn_vm/files/vm-run b/roles/lmn_vm/files/vm-run
index d37174c..af0bd67 100755
--- a/roles/lmn_vm/files/vm-run
+++ b/roles/lmn_vm/files/vm-run
@@ -346,11 +346,16 @@ if  ! virsh --connect="${QEMU}" list | grep "${VM_NAME}-clone"; then
     virsh --connect=qemu:///session undefine --nvram "${VM_NAME}-clone" || echo "${VM_NAME}-clone did not exist"
     #trap exit_script SIGHUP SIGINT SIGTERM
 
-    if id | grep -q teachers; then
-      NETHOME=/srv/samba/schools/default-school/teachers/$USER
-    else
+    for dir in teachers examusers staff parents; do
+      if [[ -d "/srv/samba/schools/default-school/${dir}/${USER}" ]]; then
+        NETHOME="/srv/samba/schools/default-school/${dir}/${USER}"
+	break
+      fi
+    done
+    if [[ -z "${NETHOME+x}" ]]; then
       NETHOME=(/srv/samba/schools/default-school/students/*/"$USER")
     fi
+
     if [[ "${HOME}" != "${NETHOME}" ]]; then
       VMINFO_DIR="${HOME}"
     else
diff --git a/roles/lmn_vm/files/vm-vminfo b/roles/lmn_vm/files/vm-vminfo
index bbf6e3b..559d47f 100755
--- a/roles/lmn_vm/files/vm-vminfo
+++ b/roles/lmn_vm/files/vm-vminfo
@@ -93,9 +93,12 @@ def main():
     vminfo['User'] = environ.get('USER')
     vminfo['Groups'] = get_groups(environ.get('USER'))
 
-    if 'teachers' in vminfo['Groups']:
-        nethome = f"/srv/samba/schools/default-school/teachers/{vminfo['User']}"
-    else:
+    for dir in ['teachers','examusers','staff','parents']:
+        potential_path = f"/srv/samba/schools/default-school/{dir}/{vminfo['User']}"
+        if path.isdir(potential_path):
+            nethome = potential_path
+            break
+    if not nethome:
         result = subprocess.run(['find', '/srv/samba/schools/default-school/students/', '-name', vminfo['User'], '-maxdepth', '2', '-type', 'd'], capture_output=True, text=True, check=False)
         nethome = result.stdout.splitlines()[0]