Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-10-08 22:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(post-install): divert gzip instead of replacing it for pigz

Browse Source 
A gzip package update overwrote the pigz wrapper, and uninstall could
restore a stale gzip.original over a newer binary. Use dpkg-divert
(--no-rename, gzip is Essential), migrate existing installs, and also
divert the /usr path on bookworm so a PVE 8 -> 9 upgrade keeps working.
This commit is contained in:
pbr
2026-09-30 22:55:05 +02:00
parent d137bb3d31
commit 4f651ffed5
2 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/post_install/customizable_post_install.sh
+26 -12
View File
@@ -1682,20 +1682,34 @@ EOF
msg_ok "$(translate "pigz wrapper script created")"
fi
# Replace gzip with pigz wrapper
# Replace gzip with pigz wrapper. gzip is diverted so package updates
# land in gzip.distrib instead of overwriting the wrapper.
msg_info "$(translate "Replacing gzip with pigz wrapper...")"
if [ ! -f /bin/gzip.original ]; then
mv -f /bin/gzip /bin/gzip.original && \
pmx_write_file /bin/gzip < /bin/pigzwrapper && \
chmod +x /bin/gzip
msg_ok "$(translate "gzip replaced with pigz wrapper successfully")"
elif ! cmp -s /bin/gzip /bin/pigzwrapper; then
pmx_write_file /bin/gzip < /bin/pigzwrapper && \
chmod +x /bin/gzip
msg_ok "$(translate "gzip replaced with pigz wrapper successfully")"
else
msg_ok "$(translate "gzip replaced with pigz wrapper successfully")"
local gz src
gz=$(dpkg -L gzip 2>/dev/null | grep -m1 -xE '(/usr)?/bin/gzip')
gz=${gz:-/usr/bin/gzip}
if [ -z "$(dpkg-divert --listpackage "$gz")" ]; then
# Older versions swapped gzip by hand and kept it as gzip.original.
# Use that as the real binary, unless a gzip update already put a
# newer one back.
src="$gz"
[ -f /bin/gzip.original ] && [ "$(head -c 2 "$gz")" = "#!" ] && src=/bin/gzip.original
pmx_write_file "$gz.distrib" < "$src" && chmod 755 "$gz.distrib"
pmx_remove_file /bin/gzip.original
pmx_record_execution "Divert gzip" "dpkg-divert --local --no-rename --divert $gz.distrib --add $gz"
dpkg-divert --local --no-rename --divert "$gz.distrib" --add "$gz" >/dev/null
# Bookworm ships /bin/gzip, trixie /usr/bin/gzip. Divert the /usr
# path too so a PVE 8 -> 9 upgrade doesn't overwrite the wrapper.
# It needs its own target: /bin/gzip.distrib is the same file, and
# dpkg deletes it when it drops the old /bin/gzip (DEP17).
[ "$gz" = /bin/gzip ] && dpkg-divert --local --no-rename --divert /usr/bin/gzip.distrib-usr --add /usr/bin/gzip >/dev/null
fi
# Left over from the bookworm diversion after upgrading to trixie.
[ "$gz" = /usr/bin/gzip ] && [ -n "$(dpkg-divert --listpackage /bin/gzip)" ] && dpkg-divert --local --no-rename --remove /bin/gzip >/dev/null
if ! cmp -s "$gz" /bin/pigzwrapper; then
pmx_write_file "$gz" < /bin/pigzwrapper
fi
msg_ok "$(translate "gzip replaced with pigz wrapper successfully")"
msg_success "$(translate "pigz configuration completed")"
register_tool "pigz" true "$FUNC_VERSION"