From e8264986afa17d627ac2d29aa96ba975debe9481 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Fri, 9 Jun 2023 14:55:55 -0700 Subject: [PATCH] Add option to ignore file changed errors https://forum.virtualmin.com/t/best-strategy-for-filesystem-backup/121093/5 --- fsdump/lang/en | 1 + fsdump/linux-lib.pl | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/fsdump/lang/en b/fsdump/lang/en index 763532ea6..85d46fa7f 100644 --- a/fsdump/lang/en +++ b/fsdump/lang/en @@ -95,6 +95,7 @@ dump_bcomp=Buffer compressed data into blocks? dump_xdev=Limit backup to one filesystem? dump_update2=Just add new files to archive? dump_ignoreread=Ignore read errors on files? +dump_ignorechanged=Ignore errors if files change? dump_notape=Prompt for new tape if needed? dump_rmt=Path to rmt on remote system dump_links=Follow symbolic links? diff --git a/fsdump/linux-lib.pl b/fsdump/linux-lib.pl index e59f1fa91..04cd9ed32 100755 --- a/fsdump/linux-lib.pl +++ b/fsdump/linux-lib.pl @@ -107,6 +107,11 @@ if ($_[0]->{'fs'} eq 'tar') { &ui_yesno_radio("ignoreread", int($_[0]->{'ignoreread'})), 1, $tds); + + print &ui_table_row(&hlink($text{'dump_ignorechanged'},"ignorechanged"), + &ui_yesno_radio("ignorechanged", + int($_[0]->{'ignorechanged'})), + 1, $tds); } elsif ($_[0]->{'fs'} eq 'xfs') { # Display xfs dump options @@ -250,6 +255,7 @@ if ($_[0]->{'fs'} eq 'tar') { } $_[0]->{'update'} = $in{'update'}; $_[0]->{'ignoreread'} = $in{'ignoreread'}; + $_[0]->{'ignorechanged'} = $in{'ignorechanged'}; if ($in{'gzip'} && $in{'update'}) { &error($text{'dump_egzip3'}); } @@ -369,6 +375,7 @@ if ($_[0]->{'fs'} eq 'tar') { $cmd .= " --rmt-command=".quotemeta($_[0]->{'rmt'}) if ($_[0]->{'rmt'}); $cmd .= " --ignore-failed-read" if ($_[0]->{'ignoreread'}); + $cmd .= " --warning=no-file-changed" if ($_[0]->{'ignorechanged'}); if ($_[0]->{'exclude'}) { foreach my $e (&split_quoted_string($_[0]->{'exclude'})) { $cmd .= " --exclude ".quotemeta($e);