mirror of
https://github.com/Kron4ek/Conty
synced 2024-12-26 09:58:38 +01:00
Use host system's pacman cache if possible
When updating Conty, use packages from the host system's pacman cache if it exists and non-empty. May save internet traffic and speed up the update process. #85
This commit is contained in:
parent
75a46c0edd
commit
34a156dd0e
1 changed files with 9 additions and 2 deletions
|
@ -31,7 +31,7 @@ script_version="1.24.3"
|
||||||
# size to 0
|
# size to 0
|
||||||
init_size=50000
|
init_size=50000
|
||||||
bash_size=1490760
|
bash_size=1490760
|
||||||
script_size=37233
|
script_size=37478
|
||||||
busybox_size=1161112
|
busybox_size=1161112
|
||||||
utils_size=4327795
|
utils_size=4327795
|
||||||
|
|
||||||
|
@ -412,6 +412,11 @@ nvidia_driver_handler () {
|
||||||
}
|
}
|
||||||
|
|
||||||
update_conty () {
|
update_conty () {
|
||||||
|
if [ "$(ls /var/cache/pacman/pkg_host 2>/dev/null)" ]; then
|
||||||
|
mkdir -p /var/cache/pacman/pkg
|
||||||
|
ln -s /var/cache/pacman/pkg_host/* /var/cache/pacman/pkg 2>/dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
reflector --protocol https --score 5 --sort rate --save /etc/pacman.d/mirrorlist
|
reflector --protocol https --score 5 --sort rate --save /etc/pacman.d/mirrorlist
|
||||||
fakeroot -- pacman -Syy 2>/dev/null
|
fakeroot -- pacman -Syy 2>/dev/null
|
||||||
date -u +"%d-%m-%Y %H:%M (DMY UTC)" > /version
|
date -u +"%d-%m-%Y %H:%M (DMY UTC)" > /version
|
||||||
|
@ -1006,8 +1011,10 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || launch_wrapper "${mount_command[@
|
||||||
echo "Updating and installing packages..."
|
echo "Updating and installing packages..."
|
||||||
cp -r "${mount_point}"/etc/pacman.d/gnupg "${overlayfs_dir}"/gnupg
|
cp -r "${mount_point}"/etc/pacman.d/gnupg "${overlayfs_dir}"/gnupg
|
||||||
export -f update_conty
|
export -f update_conty
|
||||||
run_bwrap --bind "${overlayfs_dir}"/gnupg /etc/pacman.d/gnupg \
|
run_bwrap \
|
||||||
|
--bind "${overlayfs_dir}"/gnupg /etc/pacman.d/gnupg \
|
||||||
--bind "${overlayfs_dir}"/merged/var /var \
|
--bind "${overlayfs_dir}"/merged/var /var \
|
||||||
|
--bind-try /var/cache/pacman/pkg /var/cache/pacman/pkg_host \
|
||||||
bash -c update_conty
|
bash -c update_conty
|
||||||
|
|
||||||
if [ "${dwarfs_image}" = 1 ]; then
|
if [ "${dwarfs_image}" = 1 ]; then
|
||||||
|
|
Loading…
Reference in a new issue