it-team/lmn-client
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix

Browse source
This commit is contained in:
Raphael Dannecker 2023-07-22 14:00:12 +02:00
parent 57c5e35c57
commit 6489889860
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
roles/lmn_vm/files/mounthome.sh
View file

@ -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}/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" findmnt "/media/${SUDO_USER}/linuxhome" && umount "/media/${SUDO_USER}/linuxhome" && rmdir "/media/${SUDO_USER}/linuxhome"
elif [ "$#" -gt 0 ] && [ "$1" = '-o' ]; then 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 -rp "Username: " username
read -srp "Passwort: " PASSWD read -srp "Passwort: " PASSWD
export PASSWD export PASSWD
@ -28,19 +30,24 @@ elif [ "$#" -gt 0 ] && [ "$1" = '-o' ]; then
#if [[ ! "${errcode}" ]]; then #if [[ ! "${errcode}" ]]; then
mount -t cifs -o "username=${username},uid=${SUDO_UID},gid=1010,file_mode=0770,dir_mode=0770,forceuid,forcegid" \ 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" "//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 "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 trap exit_script SIGHUP SIGINT SIGTERM
sleep infinity sleep infinity
elif [ "$#" -gt 0 ] && [ "$1" = '-l' ]; then 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 read -rp "Username: " username
mkdir -p "/media/${SUDO_USER}/linuxhome" mkdir -p "/media/${SUDO_USER}/linuxhome"
mount -t fuse -o "allow_other,uid=${SUDO_UID},gid=1010,reconnect" \ mount -t fuse -o "allow_other,uid=${SUDO_UID},gid=1010,reconnect" \
"sshfs#${username}@home.steinbeisschule-reutlingen.de:" "/media/${SUDO_USER}/linuxhome" "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 "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 trap exit_script SIGHUP SIGINT SIGTERM
sleep infinity sleep infinity
else else

4
roles/lmn_vm/files/sync-vm.sh
View file

@ -49,8 +49,8 @@ sync_all_torrents() {
rsync -av --password-file=/etc/rsync.secret rsync://vmuser@server:/vmimages-download/xml \ rsync -av --password-file=/etc/rsync.secret rsync://vmuser@server:/vmimages-download/xml \
/var/lib/libvirt/images/ /var/lib/libvirt/images/
rsync -av --password-file=/etc/rsync.secret rsync://vmuser@server:/vmimages-download/desktop/*.desktop \ rsync -av --password-file=/etc/rsync.secret rsync://vmuser@server:/vmimages-download/desktop/*.desktop \
/usr/share/applications/ /usr/local/share/applications/
update-desktop-database /usr/share/applications update-desktop-database /usr/local/share/applications
} }
create_starter() { create_starter() {