Skip to content

make sure that necessary quotes are retained for --fusemount "..." option in output produced by eessi_container.sh #304

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

Merged
bedroge merged 2 commits into from
Sep 11, 2026
Merged

make sure that necessary quotes are retained for --fusemount "..." option in output produced by eessi_container.sh #304

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdc3a9d
make sure that necessary quotes are retained for --fusemount "..." op…
boegel Sep 11, 2026
d7d18f6
Merge branch 'main' into eessi_container_fusemount_quotes
bedroge Sep 11, 2026
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
12 changes: 6 additions & 6 deletions eessi_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ if [ -z ${EESSI_DO_NOT_MOUNT_CVMFS_CONFIG_CERN_CH+x} ]; then
if [[ -x $(command -v cvmfs_config) ]] && cvmfs_config probe cvmfs-config.cern.ch >& /dev/null; then
BIND_PATHS="${BIND_PATHS},/cvmfs/cvmfs-config.cern.ch"
else
EESSI_FUSE_MOUNTS+=("--fusemount" "container:cvmfs2 cvmfs-config.cern.ch /cvmfs/cvmfs-config.cern.ch")
EESSI_FUSE_MOUNTS+=("--fusemount" '"container:cvmfs2 cvmfs-config.cern.ch /cvmfs/cvmfs-config.cern.ch"')

@Micket Micket Sep 11, 2026 •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
EESSI_FUSE_MOUNTS+=("--fusemount" '"container:cvmfs2 cvmfs-config.cern.ch /cvmfs/cvmfs-config.cern.ch"')
EESSI_FUSE_MOUNTS+=("--fusemount" "\"container:cvmfs2 cvmfs-config.cern.ch /cvmfs/cvmfs-config.cern.ch\"")

For consistency?

@boegel boegel Sep 11, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Meh, I figured I could avoid escaping the double quotes here, since there's no ${EESSI*} environment variable involved here, I would keep it as is.

fi
fi

Expand Down Expand Up @@ -926,7 +926,7 @@ do
# make the target CernVM-FS repository available under /cvmfs_ro
if [[ ${cvmfs_repo_mount} == "fuse" ]]; then
export EESSI_READONLY="container:cvmfs2 ${cvmfs_repo_name} /cvmfs_ro/${cvmfs_repo_name}"
EESSI_FUSE_MOUNTS+=("--fusemount" "${EESSI_READONLY}")
EESSI_FUSE_MOUNTS+=("--fusemount" "\"${EESSI_READONLY}\"")
elif [[ ${cvmfs_repo_mount} == "bind" ]]; then
BIND_PATHS="/cvmfs/${cvmfs_repo_name}:/cvmfs_ro/${cvmfs_repo_name},${BIND_PATHS}"
fi
Expand All @@ -953,15 +953,15 @@ do
fi
export EESSI_READONLY_OVERLAY

EESSI_FUSE_MOUNTS+=("--fusemount" "${EESSI_READONLY_OVERLAY}")
EESSI_FUSE_MOUNTS+=("--fusemount" "\"${EESSI_READONLY_OVERLAY}\"")
export EESSI_FUSE_MOUNTS
else
# basic "ro" access that doesn't require any fuseoverlay-fs
echo "Mounting '${cvmfs_repo_name}' 'read-only' without fuse-overlayfs."

if [[ ${cvmfs_repo_mount} == "fuse" ]]; then
export EESSI_READONLY="container:cvmfs2 ${cvmfs_repo_name} /cvmfs/${cvmfs_repo_name}"
EESSI_FUSE_MOUNTS+=("--fusemount" "${EESSI_READONLY}")
EESSI_FUSE_MOUNTS+=("--fusemount" "\"${EESSI_READONLY}\"")
export EESSI_FUSE_MOUNTS
elif [[ ${cvmfs_repo_mount} == "bind" ]]; then
BIND_PATHS="/cvmfs/${cvmfs_repo_name},${BIND_PATHS}"
Expand All @@ -978,7 +978,7 @@ do
# set environment variables for fuse mounts in Singularity container
if [[ ${cvmfs_repo_mount} == "fuse" ]]; then
export EESSI_READONLY="container:cvmfs2 ${cvmfs_repo_name} /cvmfs_ro/${cvmfs_repo_name}"
EESSI_FUSE_MOUNTS+=("--fusemount" "${EESSI_READONLY}")
EESSI_FUSE_MOUNTS+=("--fusemount" "\"${EESSI_READONLY}\"")
elif [[ ${cvmfs_repo_mount} == "bind" ]]; then
BIND_PATHS="/cvmfs/${cvmfs_repo_name}:/cvmfs_ro/${cvmfs_repo_name},${BIND_PATHS}"
fi
Expand All @@ -1002,7 +1002,7 @@ do
fi
export EESSI_WRITABLE_OVERLAY

EESSI_FUSE_MOUNTS+=("--fusemount" "${EESSI_WRITABLE_OVERLAY}")
EESSI_FUSE_MOUNTS+=("--fusemount" "\"${EESSI_WRITABLE_OVERLAY}"\")
export EESSI_FUSE_MOUNTS
else
echo -e "ERROR: access mode '${cvmfs_repo_access}' for CVMFS repository\n '${cvmfs_repo_name}' is not known"
Expand Down
Loading