diff options
author | Christian Rößler | 2018-11-15 15:06:19 +0100 |
---|---|---|
committer | Christian Rößler | 2018-11-15 15:06:19 +0100 |
commit | 69e6fa25c42803b5b658ac84591452d07ed5be39 (patch) | |
tree | 42b844b57d45a72b02348d903d9706c298b637b1 /core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc | |
parent | [rfs-stage32] Don't run fstrim on mkfs as it can slow down things (diff) | |
download | mltk-69e6fa25c42803b5b658ac84591452d07ed5be39.tar.gz mltk-69e6fa25c42803b5b658ac84591452d07ed5be39.tar.xz mltk-69e6fa25c42803b5b658ac84591452d07ed5be39.zip |
[run-virt] Linux scripts: New mount/link behaviour
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 | 32 |
1 files changed, 19 insertions, 13 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 1254910e..944bdbe8 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 @@ -30,22 +30,28 @@ function mount_shares() unset USER unset PASSWD - # linken: userhomedir <-sharename, userhomedir <- shareletter ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARENAME" - # ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARELETTER" - logger "openslx sharemapper: Linking ${SHARELETTER} or ${SHARENAME}, if possible." + # 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." + else if [ -n "${SHARENAME}" ]; then - ln -s "$USERHOMEDIR" "${USERDESKTOP}"/"$SHARENAME" - logger "openslx sharemapper: ${SHARENAME} linked." + mount_share & elif [ -n "${SHARELETTER}" ]; then - ln -s "$USERHOMEDIR" "${USERDESKTOP}"/"$SHARELETTER" - logger "openslx sharemapper: No sharename found, share letter ${SHARELETTER} linked." - fi - else - if [ -z "${SHARELETTER}" ]; then - logger "openslx sharemapper: $SHARELETTER not found. Do not know where to mount." - continue - else + SHARENAME="$SHARELETTER" mount_share & + else + SHARENAME="$(basename ${SHAREPATH})" + if [ -n "${SHARENAME}" ]; then + mount_share & + else + logger "openslx sharemapper: Neither SHARENAME nor SHARELETTER found - giving up! (Config row: $CONFIGROW)" + continue + fi fi fi done |