diff options
| author | Steffen Ritter | 2021-02-25 09:50:30 +0100 |
|---|---|---|
| committer | Steffen Ritter | 2021-02-25 09:50:30 +0100 |
| commit | decadad90d03ef3d4e4fb4a39d4205650fb04dbe (patch) | |
| tree | 9e32dbc99ab14ef200c3a9f70a92aa69fa8691bf /core/modules/run-virt/data/opt/openslx/vmchooser/data/linux | |
| parent | [run-virt] set-firewall: Better error output (diff) | |
| download | mltk-decadad90d03ef3d4e4fb4a39d4205650fb04dbe.tar.gz mltk-decadad90d03ef3d4e4fb4a39d4205650fb04dbe.tar.xz mltk-decadad90d03ef3d4e4fb4a39d4205650fb04dbe.zip | |
[run-virt] use "domain=..." for all network shares
refs: #3830
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux')
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc index abeee359..e080d278 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc @@ -23,45 +23,51 @@ function already_mounted() function mounter() { + MOUNTPARAM="$1" + MOUNTOPTS="$2" + SHAREPATH="$3" + MOUNTDIR="$4" + # Ausgabe: konnte mounten: 0, konnte nicht mounten: 1, schon gemountet 2 - already_mounted "$4" + already_mounted "$MOUNTDIR" ERR=$? if [ "$ERR" -eq 0 ]; then - logger "openslx sharemapper: $3 already mounted." + logger "openslx sharemapper: $SHAREPATH already mounted." AUSGANG=2 else case "$MOUNTER" in nfs) AUSGANG=0 x=2 - while ! mount $1 $2 $3 $4 2>/dev/null 1>&2; do - logger "openslx sharemapper: could not mount ${3} to ${4}, waited another $x seconds, retrying." + while ! mount $MOUNTPARAM "${MOUNTOPTS}" "$SHAREPATH" "$MOUNTDIR" 2>/dev/null 1>&2; do + logger "openslx sharemapper: could not mount ${SHAREPATH} to ${MOUNTDIR}, waited another $x seconds, retrying." sleep $x if [ "$x" -gt 6 ]; then AUSGANG=1 - logger "openslx sharemapper: timeout, could not mount ${3} to ${4}. mount.nfs installed?" + logger "openslx sharemapper: timeout, could not mount ${SHAREPATH} to ${MOUNTDIR}. mount.nfs installed?" break fi let x=x+2 done - [ "$AUSGANG" -eq 0 ] && logger "openslx sharemapper: ${3} mounted to ${4} (nfs)." # Todo: Schöner schreiben:) + [ "$AUSGANG" -eq 0 ] && logger "openslx sharemapper: ${SHAREPATH} mounted to ${MOUNTDIR} (nfs)." # Todo: Schöner schreiben:) ;; cifs) AUSGANG=0 x=2 + [ -n "$GLOBALDOMAIN" ] && MOUNTOPTS="${MOUNTOPTS},domain=$GLOBALDOMAIN" for VERSION in $CIFSVERSIONS; do AUSGANG=0 - while ! mount $1 "$VERSION",${2} $3 $4 2>/dev/null 1>&2; do - logger "openslx sharemapper: could not mount ${3} to ${4}, waited another $x seconds, retrying." + while ! mount $MOUNTPARAM "${VERSION}","${MOUNTOPTS}" "$SHAREPATH" "$MOUNTDIR" 2>/dev/null 1>&2; do + logger "openslx sharemapper: could not mount ${SHAREPATH} to ${MOUNTDIR}, waited another $x seconds, retrying." sleep $x if [ "$x" -gt 4 ]; then AUSGANG=1 - logger "openslx sharemapper: timeout, could not mount ${3} to ${4} cifs v${VERSION}." + logger "openslx sharemapper: timeout, could not mount ${SHAREPATH} to ${MOUNTDIR} cifs v${VERSION}." break fi let x=x+2 done [ "$AUSGANG" -eq 0 ] && break done - [ "$AUSGANG" -eq 0 ] && logger "openslx sharemapper: ${3} mounted to ${4} (cifs $VERSION)." + [ "$AUSGANG" -eq 0 ] && logger "openslx sharemapper: ${SHAREPATH} mounted to ${MOUNTDIR} (cifs $VERSION)." ;; *) logger "openslx sharemapper: unknown mounter ${MOUNTER}!" ;; @@ -127,7 +133,6 @@ function mount_home() export USER="${GLOBALUSER}" export PASSWD="${PW}" ERRORMSG="" - [ -n "$GLOBALDOMAIN" ] && MOUNTOPTS="${MOUNTOPTS},domain=$GLOBALDOMAIN" mounter "${MOUNTPARAM}" "${MOUNTOPTS}" "${SHAREPATH}" "${USERHOMEDIR}" 2>/dev/null 1>&2 ERR=$? unset USER |