| @@ -1,6 +1,6 @@
--- ./rsnapshot.orig 2008-10-30 19:54:10.000000000 +0200
+++ rsnapshot 2008-11-03 15:28:07.000000000 +0200
-< at > < at > -163,6 +163,9 < at > < at >
+@@ -163,6 +163,9 @@
my $default_ssh_args = undef;
my $default_du_args = '-csh';
@@ -10,7 +10,7 @@
# set default for use_lazy_deletes
my $use_lazy_deletes = 0; # do not delete the oldest archive until after backup
-< at > < at > -801,7 +804,18 < at > < at >
+@@ -801,7 +804,18 @@
next;
}
}
@@ -30,7 +30,7 @@
# CHECK FOR cmd_preexec (optional)
if ($var eq 'cmd_preexec') {
my $script; # script file (no args)
-< at > < at > -965,7 +979,7 < at > < at >
+@@ -965,7 +979,7 @@
$line_syntax_ok = 1;
# check for lvm
@@ -39,7 +39,7 @@
# if it's an lvm path, make sure we have lvm commands and arguments
if (!defined($config_vars{'linux_lvm_cmd_lvcreate'})) {
config_err($file_line_num, "$line - Cannot handle $src, linux_lvm_cmd_lvcreate not defined in $config_file");
-< at > < at > -983,6 +997,10 < at > < at >
+@@ -983,6 +997,10 @@
config_err($file_line_num, "$line - Cannot handle $src, linux_lvm_cmd_umount not defined in $config_file");
next;
}
@@ -50,7 +50,7 @@
if (!defined($config_vars{'linux_lvm_snapshotsize'})) {
config_err($file_line_num, "$line - Cannot handle $src, linux_lvm_snapshotsize not defined in $config_file");
next;
-< at > < at > -1216,6 +1234,23 < at > < at >
+@@ -1216,6 +1234,23 @@
$line_syntax_ok = 1;
next;
}
@@ -74,7 +74,7 @@
# LOCKFILE
if ($var eq 'lockfile') {
if (!defined($value)) { config_err($file_line_num, "$line - lockfile can not be blank"); }
-< at > < at > -1713,6 +1748,11 < at > < at >
+@@ -1713,6 +1748,11 @@
if (!is_boolean($parsed_opts{'one_fs'})) {
return (undef);
}
@@ -86,7 +86,7 @@
# rsync_short_args
} elsif ( $name eq 'rsync_short_args' ) {
# must be in the format '-abcde'
-< at > < at > -2702,12 +2742,13 < at > < at >
+@@ -2702,12 +2742,13 @@
# returns 1 if it's a syntactically valid LVM path
# returns 0 otherwise
sub is_linux_lvm_path {
@@ -106,7 +106,7 @@
}
# accepts proposed list for rsync_short_args
-< at > < at > -3313,8 +3354,10 < at > < at >
+@@ -3313,8 +3354,10 @@
my $using_relative = 0;
my $linux_lvm = 0;
@@ -117,7 +117,7 @@
if (defined($$bp_ref{'src'})) {
$src = remove_trailing_slash( "$$bp_ref{'src'}" );
-< at > < at > -3444,7 +3487,15 < at > < at >
+@@ -3444,7 +3487,15 @@
} elsif ($one_fs) {
$rsync_short_args .= 'x';
}
@@ -134,7 +134,7 @@
# SEE WHAT KIND OF SOURCE WE'RE DEALING WITH
#
# local filesystem
-< at > < at > -3474,7 +3525,7 < at > < at >
+@@ -3474,7 +3525,7 @@
if ($verbose < 2) { $rsync_short_args .= 'q'; }
# LVM path
@@ -143,7 +143,7 @@
# take LVM snapshot and mount, reformat src into local path
unless (defined($config_vars{'linux_lvm_snapshotsize'})) {
-< at > < at > -3490,13 +3541,23 < at > < at >
+@@ -3490,13 +3541,23 @@
bail("Missing required argument for LVM source: linux_lvm_mountpath");
}
@@ -174,7 +174,7 @@
# assemble and execute LVM snapshot command
< at > cmd_stack = ();
push( < at > cmd_stack, $config_vars{'linux_lvm_cmd_lvcreate'});
-< at > < at > -3520,12 +3581,35 < at > < at >
+@@ -3520,12 +3581,35 @@
}
}
@@ -212,7 +212,7 @@
push( < at > cmd_stack, $config_vars{'linux_lvm_mountpath'});
print_cmd( < at > cmd_stack);
-< at > < at > -3732,7 +3816,7 < at > < at >
+@@ -3732,7 +3816,7 @@
print_cmd( < at > cmd_stack);
if (0 == $test) {
@@ -221,7 +221,7 @@
#$result = system( < at > cmd_stack);
$result = system(join " ", < at > cmd_stack, ">/dev/null");
-< at > < at > -3740,6 +3824,23 < at > < at >
+@@ -3740,6 +3824,23 @@
bail("Unmount LVM snapshot failed: $result");
}
}
@@ -245,7 +245,7 @@
< at > cmd_stack = ();
push( < at > cmd_stack, $config_vars{'linux_lvm_cmd_lvremove'});
-< at > < at > -3749,6 +3850,8 < at > < at >
+@@ -3749,6 +3850,8 @@
print_cmd( < at > cmd_stack);
if (0 == $test) {
|
