diff options
| author | Simon Rettberg | 2018-06-18 12:51:44 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-06-18 12:51:44 +0200 |
| commit | 9221a238a8bcf61bc08bfb1057a8e0587e1a60a1 (patch) | |
| tree | 3b49be78c5cde5b50e4d5565f767fb599aeb677e /core/modules/pam-slx-plug | |
| parent | [pam-slx-plug] Create directories to shut up ldapsearch (diff) | |
| download | mltk-9221a238a8bcf61bc08bfb1057a8e0587e1a60a1.tar.gz mltk-9221a238a8bcf61bc08bfb1057a8e0587e1a60a1.tar.xz mltk-9221a238a8bcf61bc08bfb1057a8e0587e1a60a1.zip | |
[pam-slx-plug] Fix minor logging issues
Diffstat (limited to 'core/modules/pam-slx-plug')
| -rw-r--r-- | core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback b/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback index 144b78ba..c1e966f6 100644 --- a/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback +++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback @@ -57,8 +57,9 @@ for opt in $OPTION_LIST; do [ -n "$EXTRA_OPTS" ] && OPTS="${OPTS},${EXTRA_OPTS}" [ "x$dom" != "x#" ] && OPTS="${OPTS},domain=$dom" [ "x$opt" != "x#" ] && OPTS="${OPTS},$opt" + OPTS=${OPTS:1} echo " ****** Trying '$OPTS'" > "$FILE" - [ -n "$OPTS" ] && COMMAND_LINE="$COMMAND_LINE -o ${OPTS:1}" + [ -n "$OPTS" ] && COMMAND_LINE="$COMMAND_LINE -o ${OPTS}" mount ${COMMAND_LINE} "${NETWORK_HOME}" "${PERSISTENT_HOME_DIR}" >> "${FILE}" 2>&1 & PID=$! # Wait max. 1 second; remember PID if this mount call seems to be running after we stop waiting @@ -90,7 +91,7 @@ fi if ! isHomeMounted; then LOG_COMBINED=$(mktemp) [ -n "$LOGFILES" ] && cat ${LOGFILES} > "$LOG_COMBINED" # No quotes - slxlog --delete "pam-ad-mount" "Mount of '${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed." "${LOG_COMBINED}" + slxlog --delete "pam-ad-mount" "Mount of '${NETWORK_HOME}' to '${PERSISTENT_HOME_DIR}' failed." "${LOG_COMBINED}" fi [ -n "${LOGFILES}" ] && rm -f -- ${LOGFILES} # No quotes |