frodovdr/log2ram
1
0
Fork 0
mirror of https://github.com/azlux/log2ram.git synced 2023-10-10 13:37:24 +02:00
Code Issues Projects Releases Wiki Activity

rollback #111

Browse Source
This commit is contained in:
Azlux 2020-05-22 10:45:30 +02:00
parent 1406472d8a
commit 324902da44
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
log2ram
View File

@ -35,14 +35,14 @@ remountOriginal() {
syncToDisk () { syncToDisk () {
isSafe isSafe
INITIAL_STATE=$(remountRW) #INITIAL_STATE=$(remountRW)
if [ "$USE_RSYNC" = true ]; then if [ "$USE_RSYNC" = true ]; then
rsync -aXv --inplace --no-whole-file --delete-after $RAM_LOG/ $HDD_LOG/ 2>&1 | tee -a $LOG2RAM_LOG rsync -aXv --inplace --no-whole-file --delete-after $RAM_LOG/ $HDD_LOG/ 2>&1 | tee -a $LOG2RAM_LOG
else else
cp -rfup $RAM_LOG/ -T $HDD_LOG/ 2>&1 | tee -a $LOG2RAM_LOG cp -rfup $RAM_LOG/ -T $HDD_LOG/ 2>&1 | tee -a $LOG2RAM_LOG
fi fi
remountOriginal ${INITIAL_STATE} #remountOriginal ${INITIAL_STATE}
} }
syncFromDisk () { syncFromDisk () {
@ -92,19 +92,20 @@ createZramLogDrive () {
} }
make_log_dir () { make_log_dir () {
[ -d $HDD_LOG/ ] || mkdir $HDD_LOG/
# if create mount failed, try to remount in rw the parent directory # if create mount failed, try to remount in rw the parent directory
# and restore original status # and restore original status
if [ ! -d $HDD_LOG/ ] ; then #if [ ! -d $HDD_LOG/ ] ; then
mkdir $HDD_LOG/ 2>/dev/null /dev/null # mkdir $HDD_LOG/ 2>/dev/null /dev/null
RESU=$? # RESU=$?
if [ "$RESU" -ne "0" ] ; then # if [ "$RESU" -ne "0" ] ; then
MOUNT_POINT=$(findmnt -T ` dirname $HDD_LOG/ ` -n --raw | cut -d ' ' -f 1 ) # MOUNT_POINT=$(findmnt -T ` dirname $HDD_LOG/ ` -n --raw | cut -d ' ' -f 1 )
mount -o remount,rw ${MOUNT_POINT} # mount -o remount,rw ${MOUNT_POINT}
sleep 0.1 # sleep 0.1
mkdir $HDD_LOG/ # mkdir $HDD_LOG/
mount -o remount,ro ${MOUNT_POINT} # mount -o remount,ro ${MOUNT_POINT}
fi # fi
fi # fi
} }
case "$1" in case "$1" in