enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2894 from nwf/master

Browse Source 
armbian-ramlog: extra rsync options
This commit is contained in:
lanefu 2021-06-13 11:19:04 -04:00 committed by GitHub
commit 63e73e50ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/bsp/common/etc/default/armbian-ramlog.dpkg-dist
View File

@ -10,3 +10,15 @@ SIZE=50M
# requires rsync installed, may provide better performance
# due to copying only new and changed files
USE_RSYNC=true
# If USE_RSYNC is true, additional options may be specified for the rsync
# commands used to synchronize logs to disk from RAM (XTRA_RSYNC_TO) or from
# disk to RAM (XTRA_RSYNC_FROM). These are bash arrays to make specifying
# multiple arguments easy even in the presence of whitespace.
XTRA_RSYNC_TO=(
## If you use log rotation programs that datestamp their logs (e.g., runit's
## svlogd or daemontools' multilog), deleting log files while synchronizing is
## likely a good idea.
# --delete
)
XTRA_RSYNC_FROM=()

13
packages/bsp/common/usr/lib/armbian/armbian-ramlog
View File

@ -48,7 +48,11 @@ syncToDisk () {
echo -e "\n\n$(date): Syncing logs to storage\n" | $LOG_OUTPUT
if [ "$USE_RSYNC" = true ]; then
${NoCache} rsync -aXWv --exclude "lost+found" --exclude armbian-ramlog.log --links $RAM_LOG $HDD_LOG 2>&1 | $LOG_OUTPUT
${NoCache} rsync -aXWv \
--exclude "lost+found" --exclude armbian-ramlog.log \
--links \
${XTRA_RSYNC_TO[@]+"${XTRA_RSYNC_TO[@]}"} \
$RAM_LOG $HDD_LOG 2>&1 | $LOG_OUTPUT
else
${NoCache} cp -rfup $RAM_LOG -T $HDD_LOG 2>&1 | $LOG_OUTPUT
fi
@ -62,7 +66,12 @@ syncFromDisk () {
echo -e "\n\n$(date): Loading logs from storage\n" | $LOG_OUTPUT
if [ "$USE_RSYNC" = true ]; then
${NoCache} rsync -aXWv --delete --exclude "lost+found" --exclude armbian-ramlog.log --exclude *.gz --exclude *.xz --exclude='*.[0-9]' --links $HDD_LOG $RAM_LOG 2>&1 | $LOG_OUTPUT
${NoCache} rsync -aXWv --delete \
--exclude "lost+found" --exclude armbian-ramlog.log \
--exclude *.gz --exclude *.xz --exclude='*.[0-9]' \
--links \
${XTRA_RSYNC_FROM[@]+"${XTRA_RSYNC_FROM[@]}"} \
$HDD_LOG $RAM_LOG 2>&1 | $LOG_OUTPUT
else
${NoCache} find $HDD_LOG* -maxdepth 1 -type f -not \( -name '*.[0-9]' -or -name '*.xz*' -or -name '*.gz' \) | xargs cp -ut $RAM_LOG
fi