IntenseWebs/distrobox
3
0
Fork 0
mirror of https://github.com/89luca89/distrobox.git synced 2026-08-19 01:14:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

init: do host file sync only if they exist

Browse Source 
Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>
This commit is contained in:
Luca Di Maio
2022-09-02 10:02:51 +02:00
parent 23bf1a1d9e
commit 8b6e883ea3
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
distrobox-init
+15 -13
View File
@@ -924,20 +924,22 @@ if [ "${init}" -eq 0 ]; then
# do stuff, only if we need to.
file_watch_src="/run/host${file_watch}"
# check if the target file is a symlink and take the source
if [ -L "${file_watch_src}" ]; then
file_watch_src="$(readlink -f "/run/host${file_watch}")"
# if it's an absolute link, we need to append /run/host ourselves.
if ! echo "${file_watch_src}" | grep -q "/run/host"; then
file_watch_src="/run/host${file_watch_src}"
if [ -e "${file_watch_src}" ]; then
if [ -L "${file_watch_src}" ]; then
file_watch_src="$(readlink -f "/run/host${file_watch}")"
# if it's an absolute link, we need to append /run/host ourselves.
if ! echo "${file_watch_src}" | grep -q "/run/host"; then
file_watch_src="/run/host${file_watch_src}"
fi
fi
if ! diff "${file_watch}" "${file_watch_src}" > /dev/null; then
# We only do this, if the file is a bind mount in the first place.
# This could be useful for init-hooks that involve umounting those
# files so that can be separated from the host.
mountpoint "${file_watch}" &&
umount "${file_watch}" &&
mount_bind "/run/host${file_watch}" "${file_watch}" rw
fi
fi
if ! diff "${file_watch}" "${file_watch_src}" > /dev/null; then
# We only do this, if the file is a bind mount in the first place.
# This could be useful for init-hooks that involve umounting those
# files so that can be separated from the host.
mountpoint "${file_watch}" &&
umount "${file_watch}" &&
mount_bind "/run/host${file_watch}" "${file_watch}" rw
fi
done
sleep 15
distrobox-upgrade
+1
View File
@@ -31,6 +31,7 @@ all=0
container_manager="autodetect"
distrobox_path="$(dirname "$(realpath "${0}")")"
distrobox_sudo_program="sudo"
rootful=0
verbose=0
version="1.3.2"