Switch to xz instead of gzip for initrd compression

1 files changed, 8 insertions, 5 deletions

diff --git a/bootstrap b/bootstrap
index b32a931..773b379 100755
--- a/bootstrap
+++ b/bootstrap
@@ -652,15 +652,18 @@ if [ "$stage" -le "5" ]; then
   # Quite a few files/directories are only accessible by root (e.g., /root) so
   # we run under sudo.
   #
+  # Note also that without --check=crc32 the kernel will not be able to
+  # decompress things.
+  #
   root_dirs="build dev etc mnt root usr var"
   root_links="bin sbin lib lib32 lib64"
 
-  info "generating buildos-rootfs.cpio.gz..."
+  info "generating buildos-rootfs.cpio.xz..."
 
   cd "$root"
   sudo find $root_dirs $root_links -print0 | \
     sudo cpio --null -o -H newc | \
-    gzip -9 > "$owd/buildos-rootfs.cpio.gz"
+    xz -9 --check=crc32 >"$owd/buildos-rootfs.cpio.xz"
   cd "$owd"
 
   subvol_snapshot -r "$root" "$root-5"
@@ -687,11 +690,11 @@ if [ "$stage" -le "6" ]; then
   sudo ln -sf "$root/usr/lib/systemd/system/buildos.service" \
     "$root/etc/systemd/system/multi-user.target.wants/buildos.service"
 
-  info "generating buildos-init.cpio.gz..."
+  info "generating buildos-init.cpio.xz..."
 
   cd "$root"
   sudo cpio -o -H newc <<EOF | \
-    gzip -9 > "$owd/buildos-init.cpio.gz"
+    xz -9 --check=crc32 >"$owd/buildos-init.cpio.xz"
 usr/lib/os-release
 init
 usr/sbin/buildos
@@ -700,7 +703,7 @@ etc/systemd/system/multi-user.target.wants/buildos.service
 EOF
   cd "$owd"
 
-  cat buildos-rootfs.cpio.gz buildos-init.cpio.gz >"buildos-initrd-$arch"
+  cat buildos-rootfs.cpio.xz buildos-init.cpio.xz >"buildos-initrd-$arch"
 
   # Copy the kernel image next to the initramfs for convenience.
   #