Fix up functions refactoring tfor a proper path to the file.

live-build/auto/config

@@ -33,6 +33,9 @@ if [ -z "$MIRROR" ]; then
 	esac
 fi
 
+mkdir -p config
+cp -af /usr/share/livecd-rootfs/live-build/functions config/functions
+
 mkdir -p config/package-lists
 
 add_task ()

live-build/functions

@@ -87,6 +87,17 @@ mount_partition() {
     setup_mountpoint "$mountpoint"
 }
 
+mount_overlay() {
+    lower="$1"
+    upper="$2"
+    work="$2/../work"
+    path="$3"
+
+    mkdir -p "$work"
+    mount -t overlay overlay \
+	-olowerdir="$lower",upperdir="$upper",workdir="$work" \
+	"$path"
+}
 
 mount_disk_image() {
     local disk_image=${1}

live-build/ubuntu-cpc/hooks/032-disk-image.binary

@@ -3,7 +3,7 @@
 IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
 FS_LABEL="cloudimg-rootfs"
 
-. auto/functions
+. config/functions
 
 BOOTPART_START=
 BOOTPART_END=

live-build/ubuntu-cpc/hooks/032-root-squashfs.binary

@@ -17,7 +17,7 @@ if [ -n "$SUBARCH" ]; then
 	exit 0
 fi
 
-. auto/functions
+. config/functions
 
 mkdir binary/boot/squashfs.dir
 cp -a chroot/* binary/boot/squashfs.dir

live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary

@@ -12,7 +12,7 @@ esac
 IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
 FS_LABEL="cloudimg-rootfs"
 
-. auto/functions
+. config/functions
 
 apt-get -qqy install dosfstools gdisk
 

live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary

@@ -10,7 +10,7 @@ esac
 IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
 FS_LABEL="cloudimg-rootfs"
 
-. auto/functions
+. config/functions
 
 create_partitions() {
     disk_image="$1"

live-build/ubuntu-cpc/hooks/040-qcow2-image.binary

@@ -21,7 +21,7 @@ esac
 
 apt-get install -qqy qemu-utils
 
-. auto/functions
+. config/functions
 
 if [ -f binary/boot/disk-uefi.ext4 ]; then
     convert_to_qcow2 binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.img

live-build/ubuntu-cpc/hooks/040-vmdk-image.binary

@@ -18,7 +18,7 @@ case ${IMAGE_TARGETS:-} in
 		;;
 esac
 
-. auto/functions
+. config/functions
 
 if [ -e binary/boot/disk-uefi.ext4 ]; then
     create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.vmdk

live-build/ubuntu-cpc/hooks/042-vagrant.binary

@@ -44,7 +44,7 @@ case $ARCH in
            exit 0;;
 esac
 
-. auto/functions
+. config/functions
 
 # Virtualbox is needed for making a small VMDK
 apt-get -qqy install genisoimage qemu-utils

live-build/ubuntu-cpc/hooks/999-extras.binary

@@ -9,7 +9,7 @@ if [ ! -d ${my_dir}/extra ]; then
 fi
 
 # Export the common functions to the extras
-. auto/functions
+. config/functions
 
 # Cleaner execution
 /bin/run-parts --regex ".*\.binary" "${extra_d}"

live-build/ubuntu-server/hooks/030-root-squashfs.binary

@@ -20,7 +20,7 @@ if [ -n "$SUBARCH" ]; then
 	exit 0
 fi
 
-. auto/functions
+. config/functions
 
 mkdir binary/boot/squashfs.dir
 cp -a chroot/* binary/boot/squashfs.dir

live-build/ubuntu-server/hooks/032-installer-squashfs.binary

@@ -21,7 +21,7 @@ if [ -n "$SUBARCH" ]; then
 	exit 0
 fi
 
-. auto/functions
+. config/functions
 
 SQUASH_ROOT=binary/boot/squashfs.dir
 OVERLAY_ROOT=binary/boot/overlay.dir