qemu-run-trick: really do not skip copy if permissions cannot be set.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/qemu-run-trick/qemu-setup-and-run b/qemu-run-trick/qemu-setup-and-run
index 42e9677be5aa79424d2c2281d2eee1f52d051a2f..509f4271eca583c9b9e200611e61e90d113715c6 100755 (executable)
--- 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