From 7d825982ae5126033e8a2ce2165cab591b7b32a1 Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Wed, 30 Nov 2016 11:24:41 -0600 Subject: [PATCH] Write sync status to HDD_LOG/log2ram.log. - Store sync status directly in the HDD log, to make sure we know about it if something fails. This won't help if the HDD_LOG variable is borked, but it'll help with everything else. - Made sync a function to avoid repeating five lines three times. - log2ram now requires (cp or rsync) and tee, mount, umount. --- log2ram | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/log2ram b/log2ram index 53ec5ec..032962b 100644 --- a/log2ram +++ b/log2ram @@ -2,37 +2,34 @@ HDD_LOG=/var/log.hdd/ RAM_LOG=/var/log/ +LOG2RAM_LOG="${HDD_LOG}log2ram.log" SIZE=40M USE_RSYNC=false +sync () { + if [ "$USE_RSYNC" = true ]; then + rsync -aXWv --delete --links $HDD_LOG $RAM_LOG 2>&1 | tee -a $LOG2RAM_LOG + else + cp -rfup $HDD_LOG -T $RAM_LOG 2>&1 | tee -a $LOG2RAM_LOG + fi +} + case "$1" in start) [ -d $HDD_LOG ] || mkdir $HDD_LOG mount --bind $RAM_LOG $HDD_LOG mount --make-private $HDD_LOG mount -t tmpfs -o nosuid,noexec,nodev,mode=0755,size=$SIZE log2ram $RAM_LOG - if [ "$USE_RSYNC" = true ]; then - rsync -aXWv --delete --links $HDD_LOG $RAM_LOG - else - cp -rfup $HDD_LOG -T $RAM_LOG - fi + sync ;; stop) - if [ "$USE_RSYNC" = true ]; then - rsync -aXWv --delete --links $RAM_LOG $HDD_LOG - else - cp -rfup $RAM_LOG -T $HDD_LOG - fi + sync umount -l $RAM_LOG umount -l $HDD_LOG ;; write) - if [ "$USE_RSYNC" = true ]; then - rsync -aXWv --delete --links $RAM_LOG $HDD_LOG - else - cp -rfup $RAM_LOG -T $HDD_LOG - fi + sync ;; esac