lfg2025/archy
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 44 Wiki Activity

Revert "fix(iso): patch debootstrap for Trixie apt 3.0.3 tar dup-entry bug"

Browse Source 
This reverts commit 9d2af707677cc98cd174fa67bdae69d137603e8d.
This commit is contained in:
Dorian 2026-04-19 13:49:48 -04:00
parent 9d2af70767
commit d22ea432dd
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
image-recipe/build-auto-installer-iso.sh
View File

@ -667,15 +667,6 @@ apt-get update -qq
apt-get install -y -qq debootstrap squashfs-tools initramfs-tools dosfstools mtools \
grub-efi-amd64-bin grub-pc-bin grub-common isolinux syslinux-common
# Patch debootstrap to tolerate duplicate tar entries.
# Debian Trixie apt 3.0.3 ships a data.tar with both a regular file
# and a symlink at the same path (e.g. libapt-private.so.0.0) which
# makes tar bail with "Cannot create symlink: File exists" on the
# very first package. --skip-old-files silently keeps the earlier
# entry, which is functionally equivalent.
sed -i "s|tar \\\$EXTRACT_DEB_TAR_OPTIONS -xf -|tar --skip-old-files \\\$EXTRACT_DEB_TAR_OPTIONS -xf -|g" /usr/share/debootstrap/functions
grep -q "skip-old-files" /usr/share/debootstrap/functions || { echo "FATAL: debootstrap patch did not take"; exit 1; }
echo " [container] Running debootstrap --variant=minbase..."
# ifupdown + isc-dhcp-client added because live-boot's /init writes
# /etc/network/interfaces on the target — without ifupdown, /etc/network/