Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2026-01-04 03:33:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow mounting directories with spaces

Browse Source
This commit is contained in:
tschettervictor
2024-12-27 12:14:04 -07:00
committed by GitHub
parent 30aa0c1408
commit 5f8c79d277
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
usr/local/share/bastille/umount.sh
View File

@@ -55,10 +55,11 @@ set_target "${TARGET}"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
info "[${_jail}]:" info "[${_jail}]:"
set -x
_jailpath="$( echo ${bastille_jailsdir}/${_jail}/root/${MOUNT_PATH} 2>/dev/null | sed 's#//#/#' )" _jailpath="$( echo "${bastille_jailsdir}/${_jail}/root/${MOUNT_PATH}" 2>/dev/null | sed 's#//#/#' | sed 's#\\##g')"
_mount="$( mount | grep -ow ${_jailpath} )" _mount="$( mount | grep -ow "${_jailpath}" )"
_fstab_entry="$( cat ${bastille_jailsdir}/${_jail}/fstab | grep -ow ${_jailpath} )" _jailpath_fstab="$(echo "${bastille_jailsdir}/${_jail}/root/${MOUNT_PATH}" | sed 's#//#/#' | sed 's#\\ #\\\\040#g')"
_fstab_entry="$(grep -Eo "[[:blank:]]${_jailpath_fstab}[[:blank:]]" ${bastille_jailsdir}/${_jail}/fstab)"
# Exit if mount point non-existent # Exit if mount point non-existent
if [ -z "${_mount}" ] && [ -z "${_fstab_entry}" ]; then if [ -z "${_mount}" ] && [ -z "${_fstab_entry}" ]; then
@@ -72,7 +73,7 @@ set -x
# Remove entry from fstab # Remove entry from fstab
if [ -n "${_fstab_entry}" ]; then if [ -n "${_fstab_entry}" ]; then
if ! sed -E -i '' "\, +${_jailpath} +,d" "${bastille_jailsdir}/${_jail}/fstab"; then if ! sed -E -i '' "\, +${_jailpath_fstab} +,d" "${bastille_jailsdir}/${_jail}/fstab"; then
error_continue "Failed to delete fstab entry: ${MOUNT_PATH}" error_continue "Failed to delete fstab entry: ${MOUNT_PATH}"
fi fi
fi fi
@@ -82,5 +83,6 @@ set -x
rm -f "${_jailpath}" || error_continue "Failed to unmount volume: ${MOUNT_PATH}" rm -f "${_jailpath}" || error_continue "Failed to unmount volume: ${MOUNT_PATH}"
fi fi
echo "Unmounted: ${MOUNT_PATH}" echo "Unmounted: ${_jailpath}"
done done