From 648988986028bc4c8985ab393711e3b0e3b325fa Mon Sep 17 00:00:00 2001
From: Raphael Dannecker <raphael.dannecker@steinbeisschule-reutlingen.de>
Date: Sat, 22 Jul 2023 14:00:12 +0200
Subject: [PATCH] bugfix

---
 roles/lmn_vm/files/mounthome.sh | 15 +++++++++++----
 roles/lmn_vm/files/sync-vm.sh   |  4 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/roles/lmn_vm/files/mounthome.sh b/roles/lmn_vm/files/mounthome.sh
index 078096f..9aaf587 100755
--- a/roles/lmn_vm/files/mounthome.sh
+++ b/roles/lmn_vm/files/mounthome.sh
@@ -18,6 +18,8 @@ if [[ "$#" -gt 0 ]] && [[ "$1" = '-u' ]]; then
     findmnt "/media/${SUDO_USER}/oldhome" && umount "/media/${SUDO_USER}/oldhome" && rmdir "/media/${SUDO_USER}/oldhome"
     findmnt "/media/${SUDO_USER}/linuxhome" && umount "/media/${SUDO_USER}/linuxhome" && rmdir "/media/${SUDO_USER}/linuxhome"
 elif [ "$#" -gt 0 ] && [ "$1" = '-o' ]; then
+    echo "Einbinden der Daten des alten/bisherigen Systems (PaedML Novell)."
+    echo "Bitte den Username und Passwort aus dem ALTEN System eingeben."
     read -rp "Username: " username
     read -srp "Passwort: " PASSWD
     export PASSWD
@@ -28,19 +30,24 @@ elif [ "$#" -gt 0 ] && [ "$1" = '-o' ]; then
     #if [[ ! "${errcode}" ]]; then
     mount -t cifs -o "username=${username},uid=${SUDO_UID},gid=1010,file_mode=0770,dir_mode=0770,forceuid,forcegid" \
 	    "//192.168.1.2/DOCS/fvs" "/media/${SUDO_USER}/oldhome"
-    echo "Mounting successfull!"
+    #echo "Mounting successfull!"
+    echo "Einbindung erfolgreich!"
     echo "Dieses Fenster bitte nicht schließen!"
-    echo "Um weiter zu arbeiten: <Strg> + <Z>"
+    #echo "Um weiter zu arbeiten: <Strg> + <Z>"
     trap exit_script SIGHUP SIGINT SIGTERM
     sleep infinity 
 elif [ "$#" -gt 0 ] && [ "$1" = '-l' ]; then
+    echo "Einbinden des Netboot-Home-Verzeichnises. Daten des alten/bisherigen Systems (PaedML Novell)."
+    echo "Bitte den Username und Passwort aus dem ALTEN System (PaedML Novell) eingeben."
+    echo "Bitte auch Groß- und Kleinschreibung achten."
     read -rp "Username: " username
     mkdir -p "/media/${SUDO_USER}/linuxhome"
     mount -t fuse -o "allow_other,uid=${SUDO_UID},gid=1010,reconnect" \
           "sshfs#${username}@home.steinbeisschule-reutlingen.de:" "/media/${SUDO_USER}/linuxhome"
-    echo "Mounting successfull!"
+    #echo "Mounting successfull!"
+    echo "Einbindung erfolgreich!"
     echo "Dieses Fenster bitte nicht schließen!"
-    echo "Um weiter zu arbeiten: <Strg> + <Z>"
+    #echo "Um weiter zu arbeiten: <Strg> + <Z>"
     trap exit_script SIGHUP SIGINT SIGTERM
     sleep infinity 
 else
diff --git a/roles/lmn_vm/files/sync-vm.sh b/roles/lmn_vm/files/sync-vm.sh
index 0a551b9..71c6a53 100755
--- a/roles/lmn_vm/files/sync-vm.sh
+++ b/roles/lmn_vm/files/sync-vm.sh
@@ -49,8 +49,8 @@ sync_all_torrents() {
     rsync -av --password-file=/etc/rsync.secret rsync://vmuser@server:/vmimages-download/xml \
 	  /var/lib/libvirt/images/
     rsync -av --password-file=/etc/rsync.secret rsync://vmuser@server:/vmimages-download/desktop/*.desktop \
-	  /usr/share/applications/
-    update-desktop-database /usr/share/applications
+	  /usr/local/share/applications/
+    update-desktop-database /usr/local/share/applications
 }
 
 create_starter() {