Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix shared folder handling #5913

Merged
merged 2 commits into from
Oct 16, 2023
Merged

fix shared folder handling #5913

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85c6583
fix shared folder handling
hgy59 Oct 15, 2023
7902252
use basename to evaluate share name from path
hgy59 Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions mk/spksrc.service.installer.functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ initialize_variables ()

# Extract share volume and share name from share path when provided, and not already defined
if [ -n "${SHARE_PATH}" ]; then
install_log "Evaluate full path for SHARE_NAME [${SHARE_NAME}] and SHARE_PATH [${SHARE_PATH}]"
# migrate SHARE_PATH that holds the share name only to full share path
# this is required for installers without resource worker for file share (SRM 1, DSM 5, DSM 6 old packages)
if [ "$(echo ${SHARE_PATH} | grep ^/)" != "${SHARE_PATH}" ]; then
Expand All @@ -58,12 +57,11 @@ initialize_variables ()
else
install_log "SHARE_NAME is not an existing share [${SHARE_PATH}]."
fi
else
install_log "SHARE_PATH is absolute path [${SHARE_PATH}]."
fi
if [ -z "${SHARE_NAME}" ]; then
SHARE_NAME=$(echo $(abspath ${SHARE_PATH}) | awk -F/ '{print $3}')
SHARE_NAME=$(basename ${SHARE_PATH})
fi
install_log "Shared folder configured with SHARE_NAME [${SHARE_NAME}] and SHARE_PATH [${SHARE_PATH}]"
fi
}

Expand Down