mirror of https://github.com/azlux/log2ram.git
Support path with spaces (#130)
* Add quotes and support path with spaces * Using findmnt instead of mount | grep findmnt is part of util-linux and should be available on almost all systems
This commit is contained in:
MegaV0lt
GitHub
parent
00a929d88c
commit
549288f8d4
96
log2ram
96
log2ram
|
|
@ -3,29 +3,29 @@
|
|||
. /etc/log2ram.conf
|
||||
|
||||
if [ -z "$PATH_DISK" ]; then
|
||||
PATH_DISK="/var/log"
|
||||
PATH_DISK='/var/log'
|
||||
fi
|
||||
|
||||
LOG_NAME="log2ram.log"
|
||||
LOG_NAME='log2ram.log'
|
||||
|
||||
|
||||
isSafe () {
|
||||
[ -d $HDD_LOG/ ] || echo "ERROR: $HDD_LOG/ doesn't exist! Can't sync."
|
||||
[ -d $HDD_LOG/ ] || exit 1
|
||||
[ -d "$HDD_LOG" ] || echo "ERROR: $HDD_LOG/ doesn't exist! Can't sync."
|
||||
[ -d "$HDD_LOG" ] || exit 1
|
||||
}
|
||||
|
||||
remountOriginal() {
|
||||
OPTION=$1
|
||||
mount -o remount,${OPTION} ${HDD_LOG}
|
||||
OPTION="$1"
|
||||
mount -o remount,"$OPTION" "$HDD_LOG"
|
||||
}
|
||||
|
||||
syncToDisk () {
|
||||
isSafe
|
||||
|
||||
if [ -x "$(command -v rsync)" ]; 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
|
||||
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
|
||||
}
|
||||
|
||||
|
|
@ -36,28 +36,28 @@ syncFromDisk () {
|
|||
if [ "$ZL2R" = true ]; then
|
||||
TP_SIZE=$LOG_DISK_SIZE
|
||||
fi
|
||||
|
||||
if [ ! -z "$(du -sh -t "$TP_SIZE" $HDD_LOG/ | cut -f1)" ]; then
|
||||
echo "ERROR: RAM disk for "$HDD_LOG/" too small. Can't sync."
|
||||
umount -l $RAM_LOG/
|
||||
umount -l $HDD_LOG/
|
||||
|
||||
if [ -n "$(du -sh -t "$TP_SIZE" "$HDD_LOG"/ | cut -f1)" ]; then
|
||||
echo "ERROR: RAM disk for \"$HDD_LOG/\" too small. Can't sync."
|
||||
umount -l "$RAM_LOG"/
|
||||
umount -l "$HDD_LOG"/
|
||||
if [ "$MAIL" = true ]; then
|
||||
echo "LOG2RAM : No place on RAM for "$HDD_LOG/" anymore, fallback on the disk" | mail -s 'Log2Ram Error' root;
|
||||
echo "LOG2RAM : No place on RAM for \"$HDD_LOG/\" anymore, fallback on the disk" | mail -s 'Log2Ram Error' root;
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -x "$(command -v rsync)" ]; then
|
||||
rsync -aXv --inplace --no-whole-file --delete-after $HDD_LOG/ $RAM_LOG/ 2>&1 | tee -a $LOG2RAM_LOG
|
||||
rsync -aXv --inplace --no-whole-file --delete-after "$HDD_LOG"/ "$RAM_LOG"/ 2>&1 | tee -a "$LOG2RAM_LOG"
|
||||
else
|
||||
cp -rfup $HDD_LOG/ -T $RAM_LOG/ 2>&1 | tee -a $LOG2RAM_LOG
|
||||
cp -rfup "$HDD_LOG"/ -T "$RAM_LOG"/ 2>&1 | tee -a "$LOG2RAM_LOG"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
wait_for () {
|
||||
while ! grep -qs "$1" /proc/mounts; do
|
||||
sleep 0.1
|
||||
while ! findmnt "$1" > /dev/null; do
|
||||
sleep 0.1
|
||||
done
|
||||
}
|
||||
|
||||
|
|
@ -69,39 +69,39 @@ createZramLogDrive () {
|
|||
else
|
||||
RAM_DEV=$(cat /sys/class/zram-control/hot_add)
|
||||
fi
|
||||
echo ${COMP_ALG} > /sys/block/zram${RAM_DEV}/comp_algorithm
|
||||
echo ${LOG_DISK_SIZE} > /sys/block/zram${RAM_DEV}/disksize
|
||||
echo ${SIZE} > /sys/block/zram${RAM_DEV}/mem_limit
|
||||
mke2fs -t ext4 /dev/zram${RAM_DEV}
|
||||
echo "$COMP_ALG" > "/sys/block/zram${RAM_DEV}/comp_algorithm"
|
||||
echo "$LOG_DISK_SIZE" > "/sys/block/zram${RAM_DEV}/disksize"
|
||||
echo "$SIZE" > "/sys/block/zram${RAM_DEV}/mem_limit"
|
||||
mke2fs -t ext4 "/dev/zram${RAM_DEV}"
|
||||
}
|
||||
|
||||
make_log_dir () {
|
||||
[ -d $HDD_LOG/ ] || mkdir $HDD_LOG/
|
||||
[ -d "$HDD_LOG" ] || mkdir "$HDD_LOG"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
IFS=';'
|
||||
for i in $PATH_DISK; do
|
||||
PATH_FIRST_PART=$( echo ${i%/*} )
|
||||
PATH_LAST_PART=$( echo ${i##/*/} )
|
||||
RAM_LOG=$i
|
||||
HDD_LOG=$PATH_FIRST_PART/hdd.$PATH_LAST_PART
|
||||
PATH_FIRST_PART="${i%/*}"
|
||||
PATH_LAST_PART="${i##/*/}"
|
||||
RAM_LOG="$i"
|
||||
HDD_LOG="${PATH_FIRST_PART}/hdd.${PATH_LAST_PART}"
|
||||
LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}"
|
||||
|
||||
|
||||
make_log_dir
|
||||
|
||||
mount --bind $RAM_LOG/ $HDD_LOG/
|
||||
mount --make-private $HDD_LOG/
|
||||
wait_for $HDD_LOG
|
||||
|
||||
mount --bind "$RAM_LOG"/ "$HDD_LOG"/
|
||||
mount --make-private "$HDD_LOG"/
|
||||
wait_for "$HDD_LOG"
|
||||
|
||||
if [ "$ZL2R" = true ]; then
|
||||
createZramLogDrive
|
||||
mount -t ext4 -o nosuid,noexec,noatime,nodev,user=log2ram /dev/zram${RAM_DEV} ${RAM_LOG}/
|
||||
mount -t ext4 -o nosuid,noexec,noatime,nodev,user=log2ram "/dev/zram${RAM_DEV}" "$RAM_LOG"/
|
||||
else
|
||||
mount -t tmpfs -o nosuid,noexec,noatime,nodev,mode=0755,size=${SIZE} log2ram $RAM_LOG/
|
||||
mount -t tmpfs -o "nosuid,noexec,noatime,nodev,mode=0755,size=${SIZE}" log2ram "$RAM_LOG"/
|
||||
fi
|
||||
wait_for $RAM_LOG
|
||||
wait_for "$RAM_LOG"
|
||||
syncFromDisk
|
||||
done
|
||||
;;
|
||||
|
|
@ -109,17 +109,17 @@ case "$1" in
|
|||
stop)
|
||||
IFS=';'
|
||||
for i in $PATH_DISK; do
|
||||
PATH_FIRST_PART=$( echo ${i%/*} )
|
||||
PATH_LAST_PART=$( echo ${i##/*/} )
|
||||
RAM_LOG=$i
|
||||
HDD_LOG=$PATH_FIRST_PART/hdd.$PATH_LAST_PART
|
||||
PATH_FIRST_PART="${i%/*}"
|
||||
PATH_LAST_PART="${i##/*/}"
|
||||
RAM_LOG="$i"
|
||||
HDD_LOG="${PATH_FIRST_PART}/hdd.${PATH_LAST_PART}"
|
||||
LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}"
|
||||
|
||||
|
||||
syncToDisk
|
||||
#ZRAM_LOG=$(awk '$2 == "/var/log" {print $1}' /proc/mounts)
|
||||
#ZRAM_LOG=$(echo ${ZRAM_LOG} | grep -o -E '[0-9]+')
|
||||
umount -l $RAM_LOG/
|
||||
umount -l $HDD_LOG/
|
||||
umount -l "$RAM_LOG"/
|
||||
umount -l "$HDD_LOG"/
|
||||
# Unsure as even with Root permision denied
|
||||
#echo ${ZRAM_LOG} > /sys/class/zram-control/hot_remove
|
||||
done
|
||||
|
|
@ -128,18 +128,18 @@ case "$1" in
|
|||
write)
|
||||
IFS=';'
|
||||
for i in $PATH_DISK; do
|
||||
PATH_FIRST_PART=$( echo ${i%/*} )
|
||||
PATH_LAST_PART=$( echo ${i##/*/} )
|
||||
RAM_LOG=$i
|
||||
HDD_LOG=$PATH_FIRST_PART/hdd.$PATH_LAST_PART
|
||||
PATH_FIRST_PART="${i%/*}"
|
||||
PATH_LAST_PART="${i##/*/}"
|
||||
RAM_LOG="$i"
|
||||
HDD_LOG="${PATH_FIRST_PART}/hdd.${PATH_LAST_PART}"
|
||||
LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}"
|
||||
|
||||
|
||||
syncToDisk
|
||||
done
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "Usage: log2ram {start|stop|write}" >&2
|
||||
echo 'Usage: log2ram {start|stop|write}' >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
Loading…
Reference in New Issue