From 27eaa9328a0bc54c8cb2d21a07a7425e34af8100 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 23 Feb 2018 13:38:15 +1300 Subject: [PATCH] source config/binary in 032-installer-squashfs.binary --- live-build/functions | 1 + live-build/ubuntu-server/hooks/032-installer-squashfs.binary | 1 + 2 files changed, 2 insertions(+) diff --git a/live-build/functions b/live-build/functions index c31d306f..93d4a0dc 100644 --- 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 diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index 2b385a03..f92976ad 100755 --- 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