Skip to content

Commit

Permalink
use mmdebstrap instead of debootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
nkraetzschmar committed May 2, 2024
1 parent 6bb29dd commit 131e2d2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion builder/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ 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 "$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"

for i in proc sys dev; do mount --rbind --make-rprivate "/$i" "$chroot_dir/$i"; done
chroot "$chroot_dir" apt-get update
for i in proc sys dev; do umount -l "$chroot_dir/$i"; done

find "$chroot_dir/proc" "$chroot_dir/sys" "$chroot_dir/dev" "$chroot_dir/run" "$chroot_dir/tmp" -mindepth 1 -delete
tar --create --sort name --xattrs --xattrs-include 'security.*' --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime --transform 's|^\./||' --directory "$chroot_dir" . > "$output"

Expand Down
2 changes: 1 addition & 1 deletion pkg.list
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ cpio
cryptsetup
curl
datefudge
debootstrap
dosfstools
e2fsprogs
fdisk
Expand All @@ -16,6 +15,7 @@ libcurl4
libengine-pkcs11-openssl
libjson-c5
make
mmdebstrap
mtools
ostree
ostree-boot
Expand Down

0 comments on commit 131e2d2

Please sign in to comment.