=== removed directory 'data'
=== removed file 'data/void-keys.fslist'
--- data/void-keys.fslist	2017-12-01 16:44:57 +0000
+++ data/void-keys.fslist	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-/var	d	o0:0	m755
-/var/lib	d	o0:0	m755
-/var/lib/db	d	o0:0	m755
-/var/lib/db/xbps	d	o0:0	m755
-/var/lib/db/xbps/keys	d	o0:0	m755
-/var/lib/db/xbps/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist
-C	<?xml version="1.0" encoding="UTF-8"?>
-	<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-	<plist version="1.0">
-	<dict>
-		<key>public-key</key>
-		<data>LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUF2clN6QlpNdmd2T0NJM0FYYk9qYQoycktSa0pTVE0zYy9FalRJZ0NnRFhndW05M0JQQ3RZOE1jRlZvQ1U0T2lYSEdmVG1xMzlCVk5wTHZMSEw5S2sxCnAyNzhTQmhYVk90YkIyRVZtREtudmZJREVUbGRMR3plN3JaTlJKZHR1TjJtWi9UVnJVQjlTMHlRYytJdWY0aHYKMytEOTdWSWRUSkhBN0FTcjA0MjhwcEVHSkd3U1NoWTJYSm05RDVJMEV1R1JXYzE0TUVHN2RJS0ppWWlNMG5FNAp0WW8yL3ZINElGVEhkblZBM2dZaVp5RG5idUNBUi84RVNmVVRVMTNTTkNPZGJ1ZGYzRDVCY3krVWlNREpJM1llCjRNRktCclQ5WmhaK0dzWEJaWTQ4MmxxaVppNkNMNXB0YzlJUUZmOC9lS1phOGphdGtpVkZWZ3JLZU5Sak9UeE4KZldTdTJua3hHTlgrYmhYWXRoaUdXbUpFWThjQ0FQeUZOK0x2NVJldEsyNTZnZGNiMnNrbUVxZWZ2MnpQQyt3VgpXQmJkSDViRDRiWmpuME42Wmw4MXJ2NVJ6RHZudmYrdkQxNGFGVWJaOFFGcXU3NVBiTDR3Nm1ZTTRsZE0vZzBSCjZOWEU4QXo5Qnd4MnREZlllS3V1dHcxRXBQbTJZdkZ5VFViMWNveUF1VEdSeUFhcDFVVEh2ZzlsaFBJSm1oRlEKSjVrQ2cxcUQ3QTMxV2wwUmxuZTZoZ0dvMFpaTko1Y0pNL3YvelNUS0pjdUZnd283SDBoT0dpbDZEZm84OUI0agpHOTZBQ3lQUytEVktQRlhSWXdqL0FrYkhwYVEyZjFGTUFvU3BCcXVEcUhoM3VrazcxS1g2ajE5dDBpRjhEUUxyCnZ0RlNTZElqREEwMmx3ZVY5TmFRcFdzQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=</data>
-		<key>public-key-size</key>
-		<integer>4096</integer>
-		<key>signature-by</key>
-		<string>Void Linux</string>
-	</dict>
-	</plist>
-o0:0	m644

=== removed file 'default.void-repo-init.do'
--- default.void-repo-init.do	2017-12-01 16:44:57 +0000
+++ default.void-repo-init.do	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-#!/bin/zsh
-DO=$0
-main() {
-	defvar repository http://repo.voidlinux.eu/current
-
-	local -a xbps_args
-
-	fresh-build-dir
-
-	ifchange data/void-keys.fslist
-	fsapply data/void-keys.fslist \
-		|| die "Could not initialize XBPS trusted keys"
-
-	xbps_args+=(
-		--rootdir=$vars[build_dir]
-		--sync
-		--repository=$vars[repository]
-	)
-	xbps-install || die "void init failed"
-	hash-build-files
-}
-. ./common.zsh
-# vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4

=== removed file 'functions/build-dir-from-image'
--- functions/build-dir-from-image	2017-12-01 16:44:57 +0000
+++ functions/build-dir-from-image	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-local src fstype mount_opts
-src=$1
-fstype=${2:-auto}
-mount_opts${3:-defaults}
-[[ -e $src ]] || die "Image not found: ${(qqq)src}"
-
-if ! (($+vars[build_dir])); then
-	vars[build_dir]=$DO:h/work/$BASE:t
-fi
-if ! (($+vars[fstab])); then
-	vars[fstab]=''
-fi
-vars[fstab]+="$src:A	${vars[build_dir]:A}	$fstype	$mount_opts	0 0
-"
-
-while grep -q "^[^ ]\\+ ${vars[build_dir]:A} " /proc/mounts; do
-	umount ${vars[build_dir]:A} || die "Failed to umount ${(qqq)vars[build_dir]}"
-done
-
-local remove
-[[ -e $vars[build_dir] ]] && remove+=( $vars[build_dir]/*(DN) )
-if (($#remove)); then
-	rm -rf $remove \
-		|| die "Failed to clean build directory ${(qqq)vars[build_dir]}"
-fi
-mkdir -p $vars[changes_dir] $vars[work_dir] $vars[build_dir] \
-	|| die "Failed to create build directory ${(qqq)vars[build_dir]}"
-
-mount -a --fstab /dev/stdin <<<$vars[fstab] \
-	|| die "Failed to mount ${(qqq)vars[build_dir]}"
-# vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4

=== modified file 'functions/clone-depend-if-changed'
--- functions/clone-depend-if-changed	2017-12-01 16:44:57 +0000
+++ functions/clone-depend-if-changed	2017-11-30 22:15:23 +0000
@@ -1,19 +1,9 @@
 init-build-dir-vars
-depend "$@" %build_dir=source_dir %fstab
-
-local -a mount_opts
-mount_opts=(
-	lowerdir=${vars[build_dir]//=/\\=}
-	upperdir=${vars[changes_dir]//=/\\=}
-	workdir=${vars[work_dir]//=/\\=}
-)
-vars[fstab]+="overlay	${vars[build_dir]:A}	overlay	${(j:,:)mount_opts}	0 0
-"
-
+depend "$@" %build_dir=source_dir
 hash-changes
 exit-if-unchanged
 
-while grep -q "^[^ ]\\+ ${vars[build_dir]:A} " /proc/mounts; do
+while grep -q "^overlay ${vars[build_dir]:A} overlay" /proc/mounts; do
 	umount ${vars[build_dir]:A} || die "Failed to umount ${(qqq)vars[build_dir]}"
 done
 
@@ -27,7 +17,13 @@
 mkdir -p $vars[changes_dir] $vars[work_dir] $vars[build_dir] \
 	|| die "Failed to create work directories"
 
-mount -a --fstab /dev/stdin <<<$vars[fstab] \
+local -a mount_opts
+mount_opts=(
+	lowerdir=${vars[build_dir]//=/\\=}
+	upperdir=${vars[changes_dir]//=/\\=}
+	workdir=${vars[work_dir]//=/\\=}
+)
+mount -t overlay overlay -o ${(j:,:)mount_opts} ${vars[build_dir]:A} \
 	|| die "Failed to mount ${(qqq)vars[build_dir]}"
 grep -q "^overlay ${vars[build_dir]:A} overlay" /proc/mounts \
 	|| die "Not visible as mounted: ${(qqq)vars[build_dir]}"

=== modified file 'functions/fresh-build-dir'
--- functions/fresh-build-dir	2017-12-01 16:44:57 +0000
+++ functions/fresh-build-dir	2017-11-30 20:18:01 +0000
@@ -1,20 +1,10 @@
 if ! (($+vars[build_dir])); then
 	vars[build_dir]=$DO:h/work/$BASE:t
 fi
-if ! (($+vars[fstab])); then
-	vars[fstab]=''
-fi
-while grep -q "^[^ ]\\+ ${vars[build_dir]:A} " /proc/mounts; do
-	umount ${vars[build_dir]:A} || die "Failed to umount ${(qqq)vars[build_dir]}"
-done
-
-local remove
-[[ -e $vars[build_dir] ]] && remove+=( $vars[build_dir]/*(DN) )
-if (($#remove)); then
-	rm -rf $remove \
+if [[ -e $vars[build_dir] ]]; then
+	rm -rf $vars[build_dir] \
 		|| die "Failed to clean build directory ${(qqq)vars[build_dir]}"
 fi
 mkdir -p $vars[build_dir] \
 	|| die "Failed to create build directory ${(qqq)vars[build_dir]}"
-
 # vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4