From 017d3a434142386de37655d4454fa2ca9c2c78e9 Mon Sep 17 00:00:00 2001 From: chz^3 Date: Sun, 9 Oct 2016 14:09:25 -0700 Subject: [PATCH] rsync single file system (#25) If proc is mounted in rootfs (e.g., via chroot), rsync will try copying kcore when permitted to cross file system boundaries. --- export-image/prerun.sh | 2 +- scripts/common | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/export-image/prerun.sh b/export-image/prerun.sh index aaf9bfa..e1aa05d 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -45,4 +45,4 @@ mount -v $ROOT_DEV ${ROOTFS_DIR} -t ext4 mkdir -p ${ROOTFS_DIR}/boot mount -v $BOOT_DEV ${ROOTFS_DIR}/boot -t vfat -rsync ${EXPORT_ROOTFS_DIR}/ ${ROOTFS_DIR}/ -aHAX +rsync -aHAXx ${EXPORT_ROOTFS_DIR}/ ${ROOTFS_DIR}/ diff --git a/scripts/common b/scripts/common index ad00c08..dd4a5f5 100644 --- a/scripts/common +++ b/scripts/common @@ -27,7 +27,7 @@ copy_previous(){ false fi mkdir -p ${ROOTFS_DIR} - rsync -aHAX ${PREV_ROOTFS_DIR}/ ${ROOTFS_DIR}/ + rsync -aHAXx ${PREV_ROOTFS_DIR}/ ${ROOTFS_DIR}/ } export -f copy_previous