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

work even on a readonly filesystem

Browse Source 
Merge pull request #111 from organic-ip/master
This commit is contained in:
azlux 2020-05-20 02:01:45 +02:00 committed by GitHub
commit 0e09169876
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
log2ram
View File

@ -10,14 +10,35 @@ isSafe () {
[ -d $HDD_LOG/ ] || exit 1 [ -d $HDD_LOG/ ] || exit 1
} }
remountRW() {
touch $HDD_LOG/$$ 2>/dev/null >/dev/null
RESU=$?
INITIAL_STATUS=ro
if [ "$RESU" != "0" ] ; then
mount -o remount,rw ${HDD_LOG}
else
INITIAL_STATUS=rw
rm $HDD_LOG/$$ 2>/dev/null
fi
# for return
echo $INITIAL_STATUS
}
remountOriginal() {
OPTION=$1
mount -o remount,${OPTION} ${HDD_LOG}
}
syncToDisk () { syncToDisk () {
isSafe isSafe
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}
} }
syncFromDisk () { syncFromDisk () {
@ -43,6 +64,7 @@ syncFromDisk () {
else 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 fi
} }
wait_for () { wait_for () {
@ -65,6 +87,22 @@ createZramLogDrive () {
mke2fs -t ext4 /dev/zram${RAM_DEV} mke2fs -t ext4 /dev/zram${RAM_DEV}
} }
make_log_dir () {
# if create mount failed, try to remount in rw the parent directory
# and restore original status
if [ ! -d $HDD_LOG/ ] ; then
mkdir $HDD_LOG/ 2>/dev/null /dev/null
RESU=$?
if [ "$RESU" -ne "0" ] ; then
MOUNT_POINT=$(findmnt -T ` dirname $HDD_LOG/ ` -n --raw | cut -d ' ' -f 1 )
mount -o remount,rw ${MOUNT_POINT}
sleep 0.1
mkdir $HDD_LOG/
mount -o remount,ro ${MOUNT_POINT}
fi
fi
}
case "$1" in case "$1" in
start) start)
IFS=';' IFS=';'
@ -74,17 +112,16 @@ case "$1" in
RAM_LOG=$i RAM_LOG=$i
HDD_LOG=$PATH_FIRST_PART/hdd.$PATH_LAST_PART HDD_LOG=$PATH_FIRST_PART/hdd.$PATH_LAST_PART
LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}" LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}"
make_log_dir
[ -d $HDD_LOG/ ] || mkdir $HDD_LOG/
mount --bind $RAM_LOG/ $HDD_LOG/ mount --bind $RAM_LOG/ $HDD_LOG/
mount --make-private $HDD_LOG/ mount --make-private $HDD_LOG/
wait_for $HDD_LOG wait_for $HDD_LOG
if [ "$ZL2R" = true ]; then if [ "$ZL2R" = true ]; then
createZramLogDrive createZramLogDrive
mount -t ext4 -o nosuid,noexec,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 else
mount -t tmpfs -o nosuid,noexec,nodev,mode=0755,size=${SIZE} log2ram $RAM_LOG/ mount -t tmpfs -o nosuid,noexec,noatime,nodev,mode=0755,size=${SIZE} log2ram $RAM_LOG/
fi fi
wait_for $RAM_LOG wait_for $RAM_LOG
syncFromDisk syncFromDisk

2
log2ram.service
View File

@ -1,7 +1,7 @@
[Unit] [Unit]
Description=Log2Ram Description=Log2Ram
DefaultDependencies=no DefaultDependencies=no
Before=basic.target rsyslog.service syslog-ng.service syslog.target systemd-journald.service sysinit.target shutdown.target zram-swap-conf.service apache2.service Before=basic.target rsyslog.service syslog-ng.service syslog.target systemd-journald.service sysinit.target shutdown.target zram-swap-conf.service apache2.service lighttpd.service
After=local-fs.target After=local-fs.target
Conflicts=shutdown.target reboot.target halt.target Conflicts=shutdown.target reboot.target halt.target
RequiresMountsFor=/var/log /var/hdd.log RequiresMountsFor=/var/log /var/hdd.log