From 82bcfa427ab697b59d1f863a18fc0862ab309876 Mon Sep 17 00:00:00 2001
From: Sam Tygier <samtygier@yahoo.co.uk>
Date: Sun, 17 Feb 2019 15:29:10 +0000
Subject: [PATCH] Use different rsync options for boot and root

When copying files to boot, options that are not supported on fat32 can cause errors. For example owner, group and xattrs.
---
 export-image/prerun.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/export-image/prerun.sh b/export-image/prerun.sh
index bdf034a..7345792 100755
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@@ -66,4 +66,5 @@ mount -v "$ROOT_DEV" "${ROOTFS_DIR}" -t ext4
 mkdir -p "${ROOTFS_DIR}/boot"
 mount -v "$BOOT_DEV" "${ROOTFS_DIR}/boot" -t vfat
 
-rsync -aHAXx --exclude var/cache/apt/archives "${EXPORT_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
+rsync -aHAXx --exclude /var/cache/apt/archives --exclude /boot "${EXPORT_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
+rsync -rtx "${EXPORT_ROOTFS_DIR}/boot/" "${ROOTFS_DIR}/boot/"