From c7aec57e1cf28f88c24ea5c4ebebebb641e91225 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sun, 25 Feb 2024 22:12:54 +0100 Subject: [PATCH] armbian-install should do rsync --one-file-system Any mounted directory should not be copied but also mounted on the new boot device when booting --- packages/bsp/common/usr/sbin/armbian-install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/bsp/common/usr/sbin/armbian-install b/packages/bsp/common/usr/sbin/armbian-install index 37cf294f11..b2025d9640 100755 --- a/packages/bsp/common/usr/sbin/armbian-install +++ b/packages/bsp/common/usr/sbin/armbian-install @@ -164,7 +164,7 @@ create_armbian() # count files is needed for progress bar dialog --title " $title " --backtitle "$backtitle" --infobox "\n Counting files ... few seconds." 5 60 - TODO=$(rsync -ahvrltDn --delete --stats --exclude-from=$EX_LIST / "${TempDir}"/rootfs | grep "Number of files:"|awk '{print $4}' | tr -d '.,') + TODO=$(rsync -avx --delete --stats --exclude-from=$EX_LIST / "${TempDir}"/rootfs | grep "Number of files:"|awk '{print $4}' | tr -d '.,') echo -e "\nCopying ${TODO} files to $2. \c" >> $logfile # creating rootfs @@ -179,7 +179,7 @@ create_armbian() # Launch rsync in background { \ - rsync -avrltD --delete --exclude-from=$EX_LIST / "${TempDir}"/rootfs | \ + rsync -avx --delete --exclude-from=$EX_LIST / "${TempDir}"/rootfs | \ nl | awk '{ printf "%.0f\n", 100*$1/"'"$TODO"'" }' \ > "${nsi_conn_progress}" ; # create empty persistent journal directory if it exists before install @@ -225,7 +225,7 @@ create_armbian() # run rsync again to silently catch outstanding changes between / and "${TempDir}"/rootfs/ dialog --title "$title" --backtitle "$backtitle" --infobox "\n Cleaning up ... Almost done." 5 60 - rsync -avrltD --delete --exclude-from=$EX_LIST / "${TempDir}"/rootfs >/dev/null 2>&1 + rsync -avx --delete --exclude-from=$EX_LIST / "${TempDir}"/rootfs >/dev/null 2>&1 # creating fstab from scratch rm -f "${TempDir}"/rootfs/etc/fstab