diff options
| author | intrigeri <intrigeri@boum.org> | 2012-05-13 02:31:06 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-05-13 02:31:06 +0200 |
| commit | 38a0fc572a5211679c9887a32baf14f7096d6941 (patch) | |
| tree | 9bbbac71c9b98fe516821f923598f8227fef2c18 /handlers | |
| parent | 64b4d1c9f6db6f6b6e101e97e04d48876909f4f9 (diff) | |
| parent | a99421620f829c039324b71c88460eaf20c94c7c (diff) | |
| download | backupninja-38a0fc572a5211679c9887a32baf14f7096d6941.tar.gz backupninja-38a0fc572a5211679c9887a32baf14f7096d6941.tar.bz2 | |
Merge remote-tracking branch 'sarava/bug/3838'
Diffstat (limited to 'handlers')
| -rw-r--r-- | handlers/rsync.in | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/handlers/rsync.in b/handlers/rsync.in index 59faae0..76aca7c 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -39,7 +39,6 @@ # keepdaily = for long storage format, specify the number of daily 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 -# lockfile = lockfile to be kept during backup execution # nicelevel = rsync command nice level # enable_mv_timestamp_bug = set to "yes" if your system isnt handling timestamps correctly # tmp = temp folder @@ -129,7 +128,6 @@ function eval_config { getconf keepdaily 5 getconf keepweekly 3 getconf keepmonthly 1 - getconf lockfile getconf nicelevel 0 getconf enable_mv_timestamp_bug no 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 { filelist_flag="" @@ -1111,8 +1070,6 @@ function end_mux { # the backup procedure eval_config -check_lockfile -set_lockfile set_rsync_options start_mux stop_services @@ -1144,7 +1101,6 @@ done mount_ro run_fsck start_services -unset_lockfile end_mux echo "Finnishing backup at `date`" >> $log |