Miroirs/Conty
1
0
Fork 0
mirror of https://github.com/Kron4ek/Conty synced 2024-11-16 19:50:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't try to bind pacman dirs when using unionfs

Browse source 
This completely breaks USE_OVERLAYFS and NVIDIA_HANDLER functions on non-pacman distros.
This commit is contained in:
Kron4ek 2023-05-31 20:14:48 +05:00
parent 8ddb47e225
commit 6b29f9c6b9
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conty-start.sh
View file

@ -589,7 +589,6 @@ run_bwrap () {
unset non_standard_home
unset xsockets
unset mount_opt
unset pacman_dirs
if [ -n "${WAYLAND_DISPLAY}" ]; then
wayland_socket="${WAYLAND_DISPLAY}"
@ -718,8 +717,6 @@ run_bwrap () {
if ([ "${NVIDIA_HANDLER}" = 1 ] || [ "${USE_OVERLAYFS}" = 1 ]) && \
[ "$(ls "${overlayfs_dir}"/merged 2>/dev/null)" ]; then
newroot_path="${overlayfs_dir}"/merged
pacman_dirs=(--bind-try "${overlayfs_dir}"/merged/var/lib/pacman /var/lib/pacman \
--bind-try "${overlayfs_dir}"/merged/var/cache/pacman /var/cache/pacman)
else
newroot_path="${mount_point}"
fi
@ -757,7 +754,6 @@ run_bwrap () {
"${non_standard_home[@]}" \
"${sandbox_params[@]}" \
"${custom_home[@]}" \
"${pacman_dirs[@]}" \
"${mount_opt[@]}" \
"${xsockets[@]}" \
"${unshare_net[@]}" \