From 96b301214e1320d539577c4f1fe8dab7ef9e168e Mon Sep 17 00:00:00 2001
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Sat, 18 Mar 2017 11:55:13 +0100
Subject: [PATCH] qemu-run-trick: really do not skip copy if permissions cannot
 be set.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
---
 qemu-run-trick/qemu-setup-and-run | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/qemu-run-trick/qemu-setup-and-run b/qemu-run-trick/qemu-setup-and-run
index 42e9677..509f427 100755
--- a/qemu-run-trick/qemu-setup-and-run
+++ b/qemu-run-trick/qemu-setup-and-run
@@ -48,9 +48,8 @@ function deep_copy()
 
   while true ; do
     mkdir -p ${tgt_dir}/$(dirname ${src}) || return 1
-    cp -av ${src} ${tgt_dir}/${src#/} || \
     cp -v ${src} ${tgt_dir}/${src#/} || return 1
-
+    cp -auv ${src} ${tgt_dir}/${src#/}
 
     l=$(readlink ${src})
     if [ -z "$l" ] ; then
@@ -210,7 +209,7 @@ echo "Ready to proceed by pivot_root"
 #mkdir -p ${rootmnt}/overlay/pivot
 #pivot_root . overlay/pivot
 #exec chroot . sbin/init
-exec switch_root ${rootmnt} /sbin/init
+exec \${BINPR}switch_root ${rootmnt} /sbin/init
 EOF
 
   ) >${INITRD_DIR_ABS}/init
-- 
2.39.2