cp -a messed up the owners system folders (e.g. /etc), using -r --preserve=mode,timestamps instead

2 files changed, 4 insertions, 4 deletions

diff --git a/src/common.sh b/src/common.sh
index 9ddbb67..b388d76 100755
--- a/src/common.sh
+++ b/src/common.sh
@@ -25,20 +25,20 @@ fi
 
 function unpackHome(){
   shopt -s dotglob
-  cp -av /filesystem/home/* /home/pi
+  cp -v -r --preserve=mode,timestamps /filesystem/home/* /home/pi
   shopt -u dotglob
   chown -hR pi:pi /home/pi
 }
 
 function unpackRoot(){
   shopt -s dotglob
-  cp -av /filesystem/root/* /
+  cp -v -r --preserve=mode,timestamps /filesystem/root/* /
   shopt -u dotglob
 }
 
 function unpackBoot(){
   shopt -s dotglob
-  cp -av /filesystem/boot/* /boot
+  cp -v -r --preserve=mode,timestamps /filesystem/boot/* /boot
   shopt -u dotglob
 }
 
diff --git a/src/octopi b/src/octopi
index 35c62cf..2427f53 100755
--- a/src/octopi
+++ b/src/octopi
@@ -9,7 +9,7 @@ install_fail_on_error_trap
 
 function execute_chroot_script() {
   #move OctoPi filesystem files
-  cp -av $1/filesystem .
+  cp -vr --preserve=mode,timestamps $1/filesystem .
 
   #black magic of qemu-arm-static
   cp `which qemu-arm-static` usr/bin