source config/binary in 032-installer-squashfs.binary

7 years ago · 27eaa9328a
parent 3e69d30c9e
commit 27eaa9328a
2 changed files with 2 additions and 0 deletions
--- a/live-build/functions
+++ b/live-build/functions
@ -336,6 +336,7 @@ recreate_initramfs() {
 	# around. Beware that this was written for a single use case
 	# (live-server) and may not work in all cases without
 	# tweaking...
+	# config/binary must be sourced before calling this function.
 	CHROOT="$1"
 	# Start by cargo culting bits of lb_chroot_hacks:
 	if [ -n "$LB_INITRAMFS_COMPRESSION" ]; then
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
@ -22,6 +22,7 @@ if [ -n "$SUBARCH" ]; then
 fi

 . config/functions
+. config/binary

 SQUASH_ROOT=binary/boot/squashfs.dir
 OVERLAY_ROOT=binary/overlay