Skip to content

Commit

Permalink
Merge pull request #79 from gardenlinux/mmdebstrap
Browse files Browse the repository at this point in the history
use mmdebstrap instead of debootstrap
  • Loading branch information
nkraetzschmar authored May 2, 2024
2 parents 6bb29dd + 37e608b commit d464b20
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion builder/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -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"
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 d464b20

Please sign in to comment.