Commit df6ec520 authored by Kristian Klausen's avatar Kristian Klausen 🎉
Browse files

Test without compress-force

parent 3675915e
Pipeline #7574 passed with stages
in 26 minutes and 59 seconds
......@@ -55,7 +55,7 @@ function setup_disk() {
# Partscan is racy
wait_until_settled "${LOOPDEV}"
mkfs.btrfs "${LOOPDEV}p2"
mount -o compress-force=zstd "${LOOPDEV}p2" "${MOUNT}"
mount -o compress=zstd "${LOOPDEV}p2" "${MOUNT}"
}
# Install Arch Linux to the filesystem (bootstrap)
......@@ -116,7 +116,7 @@ function mount_image() {
LOOPDEV=$(losetup --find --partscan --show "${1:-${IMAGE}}")
# Partscan is racy
wait_until_settled "${LOOPDEV}"
mount -o compress-force=zstd "${LOOPDEV}p2" "${MOUNT}"
mount -o compress=zstd "${LOOPDEV}p2" "${MOUNT}"
# Setup bind mount to package cache
mount --bind "/var/cache/pacman/pkg" "${MOUNT}/var/cache/pacman/pkg"
}
......
......@@ -71,6 +71,6 @@ EOF
sed -i 's/^GRUB_TIMEOUT=.*$/GRUB_TIMEOUT=1/' "${MOUNT}/etc/default/grub"
# setup unpredictable kernel names
sed -i 's/^GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="net.ifnames=0"/' "${MOUNT}/etc/default/grub"
sed -i 's/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"rootflags=compress-force=zstd\"/' "${MOUNT}/etc/default/grub"
sed -i 's/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"rootflags=compress=zstd\"/' "${MOUNT}/etc/default/grub"
arch-chroot "${MOUNT}" /usr/bin/grub-mkconfig -o /boot/grub/grub.cfg
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment