Miroirs/Conty
1
0
Fork 0
mirror of https://github.com/Kron4ek/Conty synced 2024-12-27 09:58:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Unmount image even when terminated ungracefully

Browse source 
This doesn't trap SIGKILL though, but there is nothing i can do about that.

Fixes #8
This commit is contained in:
Kron4ek 2021-03-30 00:41:06 +05:00 committed by GitHub
parent 5f6a7918f4
commit d2a4ae25a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
squashfs-start.sh
View file

@ -20,13 +20,13 @@ script="$(readlink -f "${script_literal}")"
# Working directory where squashfs image will be mounted # Working directory where squashfs image will be mounted
# Default path: /tmp/scriptname_username_randomnumber # Default path: /tmp/scriptname_username_randomnumber
working_dir=/tmp/"$(basename "${script}")"_"$(id -un)"_$RANDOM working_dir=/tmp/"$(basename "${script}")"_"${USER}"_${RANDOM}
# It's important to set correct sizes below, otherwise there will be # It's important to set correct sizes below, otherwise there will be
# a problem with mounting the squashfs image due to an incorrectly calculated offset. # a problem with mounting the squashfs image due to an incorrectly calculated offset.
# The size of this script # The size of this script
scriptsize=6652 scriptsize=6608
# The size of the utils.tar archive # The size of the utils.tar archive
# utils.tar contains bwrap and squashfuse binaries # utils.tar contains bwrap and squashfuse binaries
@ -35,7 +35,6 @@ utilssize=1259520
# Offset where the squashfs image is stored # Offset where the squashfs image is stored
offset=$((scriptsize+utilssize)) offset=$((scriptsize+utilssize))
if [ "$1" = "--help" ] || [ "$1" = "-h" ] || ([ -z "$1" ] && [ -z "${AUTOSTART}" ] && [ ! -L "${script_literal}" ]); then if [ "$1" = "--help" ] || [ "$1" = "-h" ] || ([ -z "$1" ] && [ -z "${AUTOSTART}" ] && [ ! -L "${script_literal}" ]); then
echo "Usage: ./conty.sh command command_arguments" echo "Usage: ./conty.sh command command_arguments"
echo echo
@ -181,9 +180,17 @@ run_bwrap () {
"$@" "$@"
} }
trap_exit () {
"${fmount}" -uz "${working_dir}"/mnt 2>/dev/null || umount --lazy "${working_dir}"/mnt 2>/dev/null
sleep 1
rm -rf "${working_dir}"
exit
}
trap 'trap_exit' EXIT
# Mount boostrap image # Mount boostrap image
mkdir -p "${working_dir}"/mnt mkdir -p "${working_dir}"/mnt
"${fmount}" -u "${working_dir}"/mnt 2>/dev/null || umount "${working_dir}"/mnt 2>/dev/null
if "${sfuse}" -o offset="${offset}" "${script}" "${working_dir}"/mnt ; then if "${sfuse}" -o offset="${offset}" "${script}" "${working_dir}"/mnt ; then
echo "Running Conty" echo "Running Conty"
@ -206,15 +213,10 @@ if "${sfuse}" -o offset="${offset}" "${script}" "${working_dir}"/mnt ; then
else else
run_bwrap "$@" ${AUTOARGS} run_bwrap "$@" ${AUTOARGS}
fi fi
"${fmount}" -uz "${working_dir}"/mnt 2>/dev/null || umount --lazy "${working_dir}"/mnt 2>/dev/null
else else
echo "Mounting the squashfs image failed!" echo "Mounting the squashfs image failed!"
exit 1 exit 1
fi fi
sleep 1
rm -rf "${working_dir}"
exit exit