diff --git a/.gitmodules b/.gitmodules index e0fab89..13a5e8e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,7 @@ [submodule "extra/devuan-keyring"] path = extra/devuan-keyring url = https://git.devuan.org/devuan-packages/devuan-keyring +[submodule "extra/debootstrap"] + path = extra/debootstrap + url = https://git.devuan.org/devuan-packages/debootstrap + branch = suites/jessie diff --git a/extra/debootstrap b/extra/debootstrap new file mode 160000 index 0000000..d2fd705 --- /dev/null +++ b/extra/debootstrap @@ -0,0 +1 @@ +Subproject commit d2fd705976704b218898a8639e2d22d8bd46769a diff --git a/zlibs/bootstrap b/zlibs/bootstrap index 5d7635b..04e9773 100644 --- a/zlibs/bootstrap +++ b/zlibs/bootstrap @@ -39,7 +39,7 @@ bootstrap_complete_base() { export LC_ALL=C export DEBIAN_FRONTEND=noninteractive - sudo -E debootstrap \ + sudo -E "$LIBPATH/extra/debootstrap/debootstrap" \ --keyring="$LIBPATH/extra/devuan-keyring/keyrings/devuan-archive-keyring.gpg" \ --foreign \ --arch $arch $release $strapdir $mirror || zerr diff --git a/zlibs/imaging b/zlibs/imaging index a5f8caf..4d7faee 100644 --- a/zlibs/imaging +++ b/zlibs/imaging @@ -44,6 +44,8 @@ image_partition_raw_dos() { parted $workdir/${image_name}.img --script -- mklabel msdos parted $workdir/${image_name}.img --script -- mkpart primary ${parted_boot} parted $workdir/${image_name}.img --script -- mkpart primary ${parted_root} + [ -n "$bootable_part" ] && \ + parted "$workdir/${image_name}.img" --script -- set "$bootable_part" boot on ## get loopdevice (see ./helpers) findloopdev