=== modified file 'default.sysresccd-supplement.do'
--- default.sysresccd-supplement.do	2017-12-13 18:54:17 +0000
+++ default.sysresccd-supplement.do	2017-12-13 00:33:30 +0000
@@ -1,7 +1,7 @@
 #!/bin/zsh
 DO=$0
 main() {
-	args build_dir fstab=
+	args build_dir fstab
 	fresh-build-dir
 	eval $(getvars)
 

=== modified file 'default.sysresccd-supplemented.do'
--- default.sysresccd-supplemented.do	2017-12-13 18:54:17 +0000
+++ default.sysresccd-supplemented.do	2017-12-13 02:07:41 +0000
@@ -2,31 +2,17 @@
 DO=$0
 main() {
 	args build_dir fstab sysrcd_dir supplement_dir
-	depend sysresccd-image-mounted build_dir:source_dir fstab:prev_fstab
-	init-build-dir-vars
+	clone-depend sysresccd-image-mounted
+
+	eval $(getvars)
 
 	depend sysresccd-supplement-enabled build_dir:sysrcd_dir fstab:sysrcd_fstab
 	depend mksquashfs build_dir:sysrcd_dir fstab:sysrcd_fstab \
-		filename:sysrcd_dat
+		filename=$build_dir/sysrcd.dat
 
 	depend sysresccd-supplement build_dir:supplement_dir fstab:supplement_fstab
 	depend mksquashfs build_dir:supplement_dir fstab:supplement_fstab \
-		filename:supplement_dat
-
-	eval $(getvars)
-	output-dir $changes_dir
-	output-dir $work_dir
-
-	local fstab_add
-	fstab_add=$(build-overlay-fstab) || die "$0: build-overlay-fstab failed"
-	fstab-add-and-mount "$fstab_add"
-
-	mkdir -p $build_dir || \
-		die "$0: Could not create build directory ${(qqq)build_dir}"
-	fstab-add-and-mount \
-		"$fstab_add" \
-		"$sysrcd_dat	$build_dir:A/sysrcd.dat	none	bind	0 0" \
-		"$supplement_dat	$build_dir:A/supplement.dat	none	bind	0 0"
+		filename=$build_dir/supplement.dat
 
 	(cd $build_dir && md5sum sysrcd.dat >sysrcd.md5) || die
 	(cd $build_dir && md5sum supplement.dat >supplement.md5) || die

=== removed file 'functions/build-overlay-fstab'
--- functions/build-overlay-fstab	2017-12-13 18:54:17 +0000
+++ functions/build-overlay-fstab	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-local -a mount_opts
-mount_opts=(
-	lowerdir=${1//=/\\=}
-	upperdir=${changes_dir//=/\\=}
-	workdir=${work_dir//=/\\=}
-)
-
-printf '%s\n' "overlay	${build_dir:A}	overlay	${(j:,:)mount_opts}	0 0"
-# vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4

=== modified file 'functions/clone-build-dir'
--- functions/clone-build-dir	2017-12-13 18:54:17 +0000
+++ functions/clone-build-dir	2017-12-13 01:24:26 +0000
@@ -2,10 +2,15 @@
 eval $(getvars build_dir changes_dir work_dir prev_fstab)
 output-dir $changes_dir
 output-dir $work_dir
+
+local -a mount_opts
+mount_opts=(
+	lowerdir=${1//=/\\=}
+	upperdir=${changes_dir//=/\\=}
+	workdir=${work_dir//=/\\=}
+)
+
 mkdir -p $build_dir || \
 	die "$0: Could not create build directory ${(qqq)build_dir}"
-
-local fstab_add
-fstab_add=$(build-overlay-fstab) || die "$0: build-overlay-fstab failed"
-fstab-add-and-mount "$fstab_add"
+fstab-add-and-mount "overlay	${build_dir:A}	overlay	${(j:,:)mount_opts}	0 0"
 # vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4