From 77d1837155f7d1124daa47221c9d85c1a3d1abc0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 11 Oct 2014 11:02:57 +0200
Subject: [PATCH] xbps-src: misc tweaks for zap and use void-packages too in
 chroot ops.

---
 common/xbps-src/shutils/chroot.sh | 5 ++---
 xbps-src                          | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index a25f7f5a965..3e4e00d089d 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -167,10 +167,9 @@ chroot_handler() {
     if [ -n "$XBPS_HOSTDIR" ]; then
         _chargs+=" -H $XBPS_HOSTDIR"
     fi
-    if [ ! -d $XBPS_MASTERDIR/xbps-packages ]; then
-        mkdir -p $XBPS_MASTERDIR/xbps-packages
+    if [ ! -d $XBPS_MASTERDIR/void-packages ]; then
+        mkdir -p $XBPS_MASTERDIR/void-packages
     fi
-    ln -sf xbps-packages $XBPS_MASTERDIR/void-packages
     _chargs+=" -D ${XBPS_DISTDIR}"
 
     [ -z "$action" -a -z "$pkg" ] && return 1
diff --git a/xbps-src b/xbps-src
index 8b7bd1c2b8c..7a495b3800a 100755
--- a/xbps-src
+++ b/xbps-src
@@ -264,7 +264,8 @@ install_bbootstrap() {
 
 masterdir_zap() {
     for f in bin boot builddir destdir dev etc home lib lib32 lib64 mnt \
-        opt proc root run sbin sys tmp usr var xbps .xbps_chroot_init; do
+        opt proc root run sbin sys tmp usr var host media xbps \
+        xbps-packages void-packages .xbps_chroot_init; do
         if [ -d "$XBPS_MASTERDIR/$f" ]; then
             echo "Removing directory $XBPS_MASTERDIR/$f ..."
             rm -rf $XBPS_MASTERDIR/$f