diff options
| author | Christian Rößler | 2018-11-29 16:41:41 +0100 |
|---|---|---|
| committer | Christian Rößler | 2018-11-29 16:41:41 +0100 |
| commit | a52b288e32bda0ce7681a009d45dbb480198fc13 (patch) | |
| tree | d15d458044cef1d6791382ea9b98dd9b4e4284ab /core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/mltk (diff) | |
| download | mltk-a52b288e32bda0ce7681a009d45dbb480198fc13.tar.gz mltk-a52b288e32bda0ce7681a009d45dbb480198fc13.tar.xz mltk-a52b288e32bda0ce7681a009d45dbb480198fc13.zip | |
[run-virt] Linux scripts some changes: Desktop links, permiss. etc
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc')
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc index 944bdbe8..8328e361 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc @@ -26,18 +26,27 @@ function mount_shares() logger "openslx sharemapper: home share \"$SHARENAME\" found (for PERSISTENT)." export USER="${GLOBALUSER}" export PASSWD="${PW}" + ERRORMSG="" mounter "${MOUNTPARAM}" "${MOUNTOPTS}" "${SHAREPATH}" "${USERHOMEDIR}" 2>/dev/null 1>&2 & + ERR=$? unset USER unset PASSWD - # linken: userhomedir <-sharename, userhomedir <- shareletter - #logger "openslx sharemapper: Linking ${USERDESKTOP}/$(basename $USERHOMEDIR, if possible." - logger "openslx sharemapper: Linking ${USERDESKTOP}/$(basename $USERHOMEDIR), if possible." - # Changed: Link on Desktop no longer "Home-verz.", but same - # name as last part of $USERHOMEDIR (-->PERSISTENT) - # ln -s "$USERHOMEDIR" "${USERDESKTOP}"/"$SHARENAME" - ln -s "$USERHOMEDIR" "${USERDESKTOP}"/$(basename "$USERHOMEDIR") - logger "openslx sharemapper: "${USERDESKTOP}"/$(basename "$USERHOMEDIR") linked." + case $ERR in 1) echo "Konnte Home-Laufwerk nicht einhängen!" >> "$USERLOGFILE" + ;; + 2) logger "openslx sharemapper: home share seems to be already mounted." + ;; + 0) logger "openslx sharemapper: Linking ${USERDESKTOP}/$(basename $USERHOMEDIR), if possible." + # Changed: Link on Desktop no longer "Home-verz.", but same + # name as last part of $USERHOMEDIR (-->PERSISTENT) + # ln -s "$USERHOMEDIR" "${USERDESKTOP}"/"$SHARENAME" + ln -s "$USERHOMEDIR" "${USERDESKTOP}"/$(basename "$USERHOMEDIR") + chown "$LOCALUSER" "${USERDESKTOP}"/$(basename "$USERHOMEDIR") + logger "openslx sharemapper: "${USERDESKTOP}"/$(basename "$USERHOMEDIR") linked." + ;; + *) logger "openslx sharemapper: Unknown error level mounting home share." + ;; + esac else if [ -n "${SHARENAME}" ]; then mount_share & |