From 9bc8bf9d2e335362222f1928eda0608b203f4f21 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 30 Jan 2017 17:24:55 +0100
Subject: [PATCH] rsync a bit differently

---
 libdevuansdk  |  2 +-
 zlibs/imaging | 20 +++++++++++---------
 zlibs/rsync   |  1 +
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/libdevuansdk b/libdevuansdk
index 45eacd2..3b34111 100644
--- a/libdevuansdk
+++ b/libdevuansdk
@@ -18,7 +18,7 @@
 # along with this source code. If not, see <http://www.gnu.org/licenses/>.
 
 libdevuansdk_version="0.3"
-LIBPATH=${LIBPATH:-`dirname $0`}
+LIBPATH=${LIBPATH:-$(dirname $0)}
 
 source $LIBPATH/config
 source $LIBPATH/zlibs/bootstrap
diff --git a/zlibs/imaging b/zlibs/imaging
index 2e3c5b1..7c776b8 100644
--- a/zlibs/imaging
+++ b/zlibs/imaging
@@ -132,11 +132,14 @@ image_raw_mount() {
 	req=(workdir bootpart rootpart)
 	ckreq || return 1
 
-	mkdir -p $workdir/boot $workdir/root
-	if [[ $parted_type = dos ]]; then
-		sudo mount $bootpart $workdir/boot && act "mounted boot partition" || zerr
-	fi
-	sudo mount $rootpart $workdir/root && act "mounted root partition" || zerr
+	#mkdir -p $workdir/boot $workdir/root
+	#sudo mount $bootpart $workdir/boot && act "mounted boot partition" || zerr
+	#sudo mount $rootpart $workdir/root && act "mounted root partition" || zerr
+
+	mkdir -p $workdir/mnt
+	sudo mount $rootpart $workdir/mnt && act "mounted root partition" || zerr
+	sudo mkdir $workdir/mnt/boot
+	sudo mount $bootpart $workdir/mnt/boot && act "mounted boot partition" || zerr
 }
 
 image_raw_umount() {
@@ -144,8 +147,7 @@ image_raw_umount() {
 	req=(workdir bootpart rootpart)
 	ckreq || return 1
 
-	if [[ $parted_type = dos ]]; then
-		sudo umount $workdir/boot && act "unmounted boot partition" || zerr
-	fi
-	sudo umount $workdir/root && act "unmounted root partition" || zerr
+	sudo umount $workdir/mnt/boot && act "unmounted boot partition" || zerr
+	sleep 1
+	sudo umount $workdir/mnt      && act "unmounted root partition" || zerr
 }
diff --git a/zlibs/rsync b/zlibs/rsync
index ef2e56e..4469948 100644
--- a/zlibs/rsync
+++ b/zlibs/rsync
@@ -26,6 +26,7 @@ rsync_to_raw_image() {
 
 	notice "rsyncing strapdir to raw image..."
 	image_raw_mount
+	sleep 1
 
 	silly
 	pushd $strapdir