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

Fix an infinite recursion when using autostart

Browse source 
Fixes #12
This commit is contained in:
Kron4ek 2021-04-01 16:13:39 +05:00 committed by GitHub
parent deec231105
commit 963351b506
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
squashfs-start.sh
View file

@ -26,7 +26,7 @@ export working_dir=/tmp/"$(basename "${script}")"_"${USER}"_${RANDOM}
# a problem with mounting the squashfs image due to an incorrectly calculated offset.
# The size of this script
scriptsize=13095
scriptsize=13213
# The size of the utils.tar archive
# utils.tar contains bwrap and squashfuse binaries
@ -205,7 +205,7 @@ run_bwrap () {
${dirs} \
${net} \
${nvidia_driver_bind} \
--setenv PATH "${PATH}:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/lib/jvm/default/bin" \
--setenv PATH "${CUSTOM_PATH}" \
"$@"
}
@ -364,9 +364,13 @@ if ${sudo_mount} "${sfuse}" -o offset="${offset}" "${script}" "${working_dir}"/m
fi
if [ -n "${autostart}" ]; then
export CUSTOM_PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/lib/jvm/default/bin"
echo "Autostarting ${autostart}"
run_bwrap "${autostart}" "$@" ${AUTOARGS}
else
export CUSTOM_PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/lib/jvm/default/bin:/usr/local/bin:/usr/local/sbin:${PATH}"
run_bwrap "$@" ${AUTOARGS}
fi
else