From 6d57e5fcef7467e25e8584b7cffd40103e49ca06 Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Thu, 1 Dec 2016 18:26:09 -0600 Subject: [PATCH] Remove log2ram log on startup, add usage. (#9) Remove log2ram log on startup. --- log2ram | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/log2ram b/log2ram index 535613b..6fea8e3 100755 --- a/log2ram +++ b/log2ram @@ -1,15 +1,22 @@ #!/bin/sh +SIZE=40M +USE_RSYNC=false + +# don't touch anything below here. + HDD_LOG=/var/log.hdd/ RAM_LOG=/var/log/ LOG2RAM_LOG="${HDD_LOG}log2ram.log" -SIZE=40M -USE_RSYNC=false LOG_OUTPUT="tee -a $LOG2RAM_LOG" -syncToDisk () { +isSafe () { [ -d $HDD_LOG ] || echo "ERROR: $HDD_LOG doesn't exist! Can't sync." [ -d $HDD_LOG ] || exit 1 +} + +syncToDisk () { + isSafe if [ "$USE_RSYNC" = true ]; then rsync -aXWv --delete --exclude log2ram.log --links $RAM_LOG $HDD_LOG 2>&1 | $LOG_OUTPUT @@ -19,8 +26,7 @@ syncToDisk () { } syncFromDisk () { - [ -d $HDD_LOG ] || echo "ERROR: $HDD_LOG doesn't exist! Can't sync." - [ -d $HDD_LOG ] || exit 1 + isSafe if [ "$USE_RSYNC" = true ]; then rsync -aXWv --delete --exclude log2ram.log --links $HDD_LOG $RAM_LOG 2>&1 | $LOG_OUTPUT @@ -33,6 +39,7 @@ syncFromDisk () { case "$1" in start) [ -d $HDD_LOG ] || mkdir $HDD_LOG + rm $LOG2RAM_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 @@ -48,4 +55,8 @@ case "$1" in write) syncToDisk ;; + *) + echo "Usage: log2ram {start|stop|write}" >&2 + exit 1 + ;; esac