From 37e608bfee59fc23443e54e43daa8f1f9c190f61 Mon Sep 17 00:00:00 2001 From: nkraetzschmar <9020053+nkraetzschmar@users.noreply.github.com> Date: Thu, 2 May 2024 13:40:46 +0200 Subject: [PATCH] use mmdebstrap instead of debootstrap --- builder/bootstrap | 2 +- pkg.list | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/bootstrap b/builder/bootstrap index 9277b38..620213f 100755 --- a/builder/bootstrap +++ b/builder/bootstrap @@ -11,7 +11,7 @@ output="$5" chroot_dir="$(mktemp -d)" mount -t tmpfs -o size="$TEMPFS_SIZE" tmpfs "$chroot_dir" chmod 755 "$chroot_dir" -container=lxc debootstrap --keyring "$keyring" --arch "$arch" --variant minbase "$version" "$chroot_dir" "$repo" trixie || (cat "$chroot_dir/debootstrap/debootstrap.log"; false) +mmdebstrap --mode unshare --keyring "$keyring" --arch "$arch" --variant required --include ca-certificates --skip cleanup/apt/lists "$version" "$chroot_dir" "$repo" gpg --keyring "$keyring" --no-default-keyring --export -a > "$chroot_dir/etc/apt/trusted.gpg.d/keyring.asc" echo "deb $repo $version main" > "$chroot_dir/etc/apt/sources.list" diff --git a/pkg.list b/pkg.list index 31c19d2..0305950 100644 --- a/pkg.list +++ b/pkg.list @@ -7,7 +7,6 @@ cpio cryptsetup curl datefudge -debootstrap dosfstools e2fsprogs fdisk @@ -16,6 +15,7 @@ libcurl4 libengine-pkcs11-openssl libjson-c5 make +mmdebstrap mtools ostree ostree-boot