diff options
| author | Christian Rößler | 2018-03-27 15:21:09 +0200 |
|---|---|---|
| committer | Christian Rößler | 2018-03-27 15:21:09 +0200 |
| commit | e21d69bfc5f1713597e1ba088008dd625647ea36 (patch) | |
| tree | 5d56d11bf7b22a67c131a8048df69f7b853ac8fd /core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc | |
| parent | [rfs-stage32] network: set arp_filter to 1 to prevent ARP flux (diff) | |
| download | mltk-e21d69bfc5f1713597e1ba088008dd625647ea36.tar.gz mltk-e21d69bfc5f1713597e1ba088008dd625647ea36.tar.xz mltk-e21d69bfc5f1713597e1ba088008dd625647ea36.zip | |
[run-virt] Linux mount scripts now mount different cifs version.
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc')
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc | 14 |
1 files changed, 9 insertions, 5 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 0ce8b427..12f08af4 100644 --- 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 @@ -12,9 +12,13 @@ function mount_shares() if [ "${SHAREPATH:0:2}" == '\\' ] || [ "${SHAREPATH:0:2}" == '//' ]; then USER=$(echo "$SHAREUSER"|cut -d '\' -f 2) SHAREPATH="${SHAREPATH//\\//}" # '\' --> `/` :-) - MOUNTOPTS="$MOUNTOPTSCIFS" + MOUNTER=cifs + MOUNTPARAM="$MOUNTCIFSPRAE" + MOUNTOPTS="$MOUNTCIFSOPTS" else - MOUNTOPTS="$MOUNTOPTSNFS" + MOUNTER=nfs + MOUNTPARAM="$MOUNTNFSPRAE" + MOUNTOPTS="$MOUNTNFSOPTS" fi # User-Homeverzeichnis? @@ -22,7 +26,7 @@ function mount_shares() logger "openslx sharemapper: home share \"$SHARENAME\" found (for PERSISTENT)." export USER="${GLOBALUSER}" export PASSWD="${PW}" - mounter "${MOUNTOPTS}" "${SHAREPATH}" "${USERHOMEDIR}" 2>/dev/null 1>&2 + mounter "${MOUNTPARAM}" "${MOUNTOPTS}" "${SHAREPATH}" "${USERHOMEDIR}" 2>/dev/null 1>&2 unset USER unset PASSWD else @@ -43,7 +47,7 @@ function mount_shares() logger "openslx sharemapper: non-home share \"$SHARENAME\" (${CONFIGROW}) found." export USER="${SHAREUSER}" export PASSWD="${SHAREPASS}" - mounter "${MOUNTOPTS}" ${SHAREPATH} ${USERSHAREDIR} 2>/dev/null 1>&2 + mounter "${MOUNTPARAM}" "${MOUNTOPTS}" "${SHAREPATH}" "${USERSHAREDIR}" 2>/dev/null 1>&2 ERR=$? unset USER unset PASSWD @@ -51,7 +55,7 @@ function mount_shares() export USER="${GLOBALUSER}" export PASSWD="${PW}" logger "openslx sharemapper: Could not mount ${USERSHAREDIR}, now trying using user credentials." - mounter "${MOUNTOPTS}" ${SHAREPATH} ${USERSHAREDIR} 2>/dev/null 1>&2 + mounter "${MOUNTPARAM}" "${MOUNTOPTS}" "${SHAREPATH}" "${USERSHAREDIR}" 2>/dev/null 1>&2 ERR=$? # ERR merken wg. Links aus USERSHAREDIR if [ "$ERR" -eq 1 ]; then logger "openslx sharemapper: Could not mount ${USERSHAREDIR} even using user credentials; giving up." |