Skip to content

Commit 4e2035f

Browse files
committed
Update bootstrap tarball extension
Starting with the 2024.05.01 release, the Arch Linux bootstrap tarball uses zstd compression. Related to https://gitlab.archlinux.org/archlinux/archiso/-/issues/130
1 parent d2f7105 commit 4e2035f

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

components/base-install.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ host_packages=(
119119
haveged
120120
parted
121121
psmisc
122+
zstd
122123
)
123124

124125
arch_packages=(
@@ -404,16 +405,16 @@ stage1_install() {
404405

405406
log "Downloading bootstrap tarball ..."
406407
set -- $(wget -qO- ${archlinux_mirror}/iso/latest/sha1sums.txt |
407-
grep "archlinux-bootstrap-[^-]*-${target_architecture}.tar.gz")
408+
grep "archlinux-bootstrap-[^-]*-${target_architecture}.tar.zst")
408409
local expected_sha1=$1
409410
local bootstrap_filename=$2
410411
download_and_verify \
411412
${archlinux_mirror}/iso/latest/${bootstrap_filename} \
412-
/d2a/bootstrap.tar.gz \
413+
/d2a/bootstrap.tar.zst \
413414
${expected_sha1}
414415

415416
log "Extracting bootstrap tarball ..."
416-
tar -xzf /d2a/bootstrap.tar.gz \
417+
tar -xf /d2a/bootstrap.tar.zst \
417418
--directory=/d2a/work/archroot \
418419
--strip-components=1
419420

install.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ host_packages=(
119119
haveged
120120
parted
121121
psmisc
122+
zstd
122123
)
123124

124125
arch_packages=(
@@ -407,16 +408,16 @@ stage1_install() {
407408

408409
log "Downloading bootstrap tarball ..."
409410
set -- $(wget -qO- ${archlinux_mirror}/iso/latest/sha256sums.txt |
410-
grep "archlinux-bootstrap-[^-]*-${target_architecture}.tar.gz")
411+
grep "archlinux-bootstrap-[^-]*-${target_architecture}.tar.zst")
411412
local expected_sha256=$1
412413
local bootstrap_filename=$2
413414
download_and_verify \
414415
${archlinux_mirror}/iso/latest/${bootstrap_filename} \
415-
/d2a/bootstrap.tar.gz \
416+
/d2a/bootstrap.tar.zst \
416417
${expected_sha256}
417418

418419
log "Extracting bootstrap tarball ..."
419-
tar -xzf /d2a/bootstrap.tar.gz \
420+
tar -xf /d2a/bootstrap.tar.zst \
420421
--directory=/d2a/work/archroot \
421422
--strip-components=1
422423

0 commit comments

Comments
 (0)