From 07e11b132b4956244ab6e5d9c9679d7a0bd0a5d5 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Fri, 16 Jun 2017 14:24:59 +0200
Subject: [PATCH 1/5] apply gio's patch to set bootable flag on the vfat
 partition

---
 zlibs/imaging | 2 ++
 1 file changed, 2 insertions(+)

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

From dfefbfe3d3bae9ffa4e2554bcd4deeb63c0a63b4 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 19 Jun 2017 12:13:46 +0200
Subject: [PATCH 2/5] add devuan's debootstrap (suites/jessie) as submodule

---
 .gitmodules       | 4 ++++
 extra/debootstrap | 1 +
 2 files changed, 5 insertions(+)
 create mode 160000 extra/debootstrap

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

From 58fe65a7193d78ec64d223c865d4479ece41275d Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 19 Jun 2017 12:16:50 +0200
Subject: [PATCH 3/5] override $PATH to use the bundled debootstrap

---
 config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config b/config
index f30e2e6..949d1c0 100644
--- a/config
+++ b/config
@@ -26,6 +26,9 @@ vars+=(usercredentials rootcredentials)
 
 arrs+=(core_packages base_packages purge_packages blend_packages)
 
+## overrides the system's debootstrap if there is one
+export PATH="$LIBPATH/extra/debootstrap:$PATH"
+
 ## enable local apt cache
 APT_CACHE=${APT_CACHE:-0}
 aptcachedir="$LIBPATH/apt-cache"

From a5490889c0901f44e5741410925cc3af949cdc3f Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 19 Jun 2017 12:27:28 +0200
Subject: [PATCH 4/5] Revert "override $PATH to use the bundled debootstrap"

This reverts commit 58fe65a7193d78ec64d223c865d4479ece41275d.
---
 config | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config b/config
index 949d1c0..f30e2e6 100644
--- a/config
+++ b/config
@@ -26,9 +26,6 @@ vars+=(usercredentials rootcredentials)
 
 arrs+=(core_packages base_packages purge_packages blend_packages)
 
-## overrides the system's debootstrap if there is one
-export PATH="$LIBPATH/extra/debootstrap:$PATH"
-
 ## enable local apt cache
 APT_CACHE=${APT_CACHE:-0}
 aptcachedir="$LIBPATH/apt-cache"

From e2738e9aefcf1fe9f7604f79eb2231a2a6273d12 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 19 Jun 2017 12:28:14 +0200
Subject: [PATCH 5/5] explicit debootstrap path

---
 zlibs/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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