Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-11-10 04:42:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sarava/bug/3838'

Browse Source
This commit is contained in:
intrigeri 2012-05-13 02:31:06 +02:00
commit 38a0fc572a
2 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/example.rsync
View File

@ -74,11 +74,6 @@ days = 7
# for long storage format, specify the number of monthly backup increments # for long storage format, specify the number of monthly backup increments
#keepmonthly = 1 #keepmonthly = 1
# use this if you need a lockfile to be kept during backup execution
# this is an useful feature in case you have some tasks that should
# know if the backup is running or not
#lockfile =
# rsync command nice level # rsync command nice level
#nicelevel = 0 #nicelevel = 0

44
handlers/rsync.in
View File

@ -39,7 +39,6 @@
# keepdaily = for long storage format, specify the number of daily backup increments # keepdaily = for long storage format, specify the number of daily backup increments
# keepweekly = for long storage format, specify the number of weekly backup increments # keepweekly = for long storage format, specify the number of weekly backup increments
# keepmonthly = for long storage format, specify the number of monthly backup increments # keepmonthly = for long storage format, specify the number of monthly backup increments
# lockfile = lockfile to be kept during backup execution
# nicelevel = rsync command nice level # nicelevel = rsync command nice level
# enable_mv_timestamp_bug = set to "yes" if your system isnt handling timestamps correctly # enable_mv_timestamp_bug = set to "yes" if your system isnt handling timestamps correctly
# tmp = temp folder # tmp = temp folder
@ -129,7 +128,6 @@ function eval_config {
getconf keepdaily 5 getconf keepdaily 5
getconf keepweekly 3 getconf keepweekly 3
getconf keepmonthly 1 getconf keepmonthly 1
getconf lockfile
getconf nicelevel 0 getconf nicelevel 0
getconf enable_mv_timestamp_bug no getconf enable_mv_timestamp_bug no
getconf tmp /tmp getconf tmp /tmp
@ -883,45 +881,6 @@ function test_connect {
} }
function set_lockfile {
if [ ! -z "$lockfile" ]; then
mkdir -p `dirname $lockfile`
if ( set -o noclobber; echo "$$" > "$lockfile" ) &> /dev/null; then
trap 'unset_lockfile' INT TERM EXIT
else
fatal "Could not create lockfile $lockfile, exiting"
fi
fi
}
function unset_lockfile {
if [ ! -z "$lockfile" ]; then
$rm -f $lockfile || warning "Could not remove lockfile $lockfile"
fi
}
function check_lockfile {
local pid process
if [ ! -z "$lockfile" ] && [ -f "$lockfile" ]; then
pid="`cat $lockfile`"
process="`ps --no-headers -o comm $pid`"
if [ "$?" == "0" ] && [ "`ps --no-headers -o comm $$`" == "$process" ]; then
info "Another backup is running for $lockfile, skipping run"
exit
else
info "Found old lockfile $lockfile, removing it"
unset_lockfile
fi
fi
}
function set_filelist { function set_filelist {
filelist_flag="" filelist_flag=""
@ -1111,8 +1070,6 @@ function end_mux {
# the backup procedure # the backup procedure
eval_config eval_config
check_lockfile
set_lockfile
set_rsync_options set_rsync_options
start_mux start_mux
stop_services stop_services
@ -1144,7 +1101,6 @@ done
mount_ro mount_ro
run_fsck run_fsck
start_services start_services
unset_lockfile
end_mux end_mux
echo "Finnishing backup at `date`" >> $log echo "Finnishing backup at `date`" >> $log