Miroirs/Conty
1
0
Fork 0
mirror of https://github.com/Kron4ek/Conty synced 2024-09-29 05:37:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use XDG_RUNTIME_DIR

Browse source 
Use XDG_RUNTIME_DIR instead of /run/user/USERID, even though XDG_RUNTIME_DIR (almost) always points to it.
This commit is contained in:
Kron4ek 2021-11-03 16:06:38 +05:00
parent 2de471c0dc
commit dc9afd7f5b
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
conty-start.sh
View file

@ -43,7 +43,7 @@ mount_point="${working_dir}"/mnt
# a problem with mounting the image due to an incorrectly calculated offset. # a problem with mounting the image due to an incorrectly calculated offset.
# The size of this script # The size of this script
scriptsize=24812 scriptsize=24914
# The size of the utils archive # The size of the utils archive
utilssize=2928770 utilssize=2928770
@ -558,6 +558,10 @@ run_bwrap () {
wayland_socket="wayland-0" wayland_socket="wayland-0"
fi fi
if [ -z "${XDG_RUNTIME_DIR}" ]; then
XDG_RUNTIME_DIR="/run/user/${EUID}"
fi
if [ "${SANDBOX}" = 1 ]; then if [ "${SANDBOX}" = 1 ]; then
sandbox_params="--tmpfs /home \ sandbox_params="--tmpfs /home \
--dir ${HOME} \ --dir ${HOME} \
@ -573,15 +577,15 @@ run_bwrap () {
if [ -n "${SANDBOX_LEVEL}" ] && [ "${SANDBOX_LEVEL}" -ge 2 ]; then if [ -n "${SANDBOX_LEVEL}" ] && [ "${SANDBOX_LEVEL}" -ge 2 ]; then
sandbox_level_msg="(level 2)" sandbox_level_msg="(level 2)"
sandbox_params="${sandbox_params} \ sandbox_params="${sandbox_params} \
--dir /run/user/${EUID} \ --dir ${XDG_RUNTIME_DIR} \
--ro-bind-try /run/user/${EUID}/${wayland_socket} /run/user/${EUID}/${wayland_socket} \ --ro-bind-try ${XDG_RUNTIME_DIR}/${wayland_socket} ${XDG_RUNTIME_DIR}/${wayland_socket} \
--unshare-pid \ --unshare-pid \
--unshare-user-try \ --unshare-user-try \
--unsetenv DBUS_SESSION_BUS_ADDRESS" --unsetenv DBUS_SESSION_BUS_ADDRESS"
else else
sandbox_level_msg="(level 1)" sandbox_level_msg="(level 1)"
sandbox_params="${sandbox_params} \ sandbox_params="${sandbox_params} \
--bind-try /run/user /run/user \ --bind-try ${XDG_RUNTIME_DIR} ${XDG_RUNTIME_DIR} \
--bind-try /run/dbus /run/dbus" --bind-try /run/dbus /run/dbus"
fi fi