diff -urN rsnapshot-1.3.1.orig//rsnapshot.1 rsnapshot-1.3.1/rsnapshot.1 --- rsnapshot-1.3.1.orig//rsnapshot.1 2008-08-31 13:23:26.000000000 +0200 +++ rsnapshot-1.3.1/rsnapshot.1 2010-04-13 16:17:13.696067710 +0200 @@ -281,6 +281,16 @@ .RE .RS 4 .Sp +\&\fBmount_args\fR +.Sp +.RS 4 +List of arguments to pass to the mount command for LVM snapshots, +e.g. \*(L"-onouuid\*(R" for succesful XFS mounts. If not specified, +mount is called without arguments, which should suffice in most cases. +.RE +.RE +.RS 4 +.Sp \&\fBretain\fR [name] [number] .Sp .RS 4 diff -urN rsnapshot-1.3.1.orig//rsnapshot-program.pl rsnapshot-1.3.1/rsnapshot-program.pl --- rsnapshot-1.3.1.orig//rsnapshot-program.pl 2010-04-13 16:05:09.147400779 +0200 +++ rsnapshot-1.3.1/rsnapshot-program.pl 2010-04-13 16:18:02.130041897 +0200 @@ -158,6 +158,7 @@ my $default_rsync_long_args = '--delete --numeric-ids --relative --delete-excluded'; my $default_ssh_args = undef; my $default_du_args = '-csh'; +my $default_mount_args = ''; # set default for use_lazy_deletes my $use_lazy_deletes = 0; # do not delete the oldest archive until after backup @@ -786,6 +787,12 @@ next; } } + # CHECK FOR mount_args (optional) + if ($var eq 'mount_args') { + $config_vars{'mount_args'} = $value; + $line_syntax_ok = 1; + next; + } # CHECK FOR umount (optional) if ($var eq 'linux_lvm_cmd_umount') { if ((-f "$value") && (-x "$value") && (1 == is_real_local_abs_path($value))) { @@ -1475,7 +1482,13 @@ } $config_vars{'rsync_long_args'} .= " $rsync_include_file_args"; } - + # set mount_args + if (defined($config_vars{'linux_lvm_cmd_mount'})) { + if (!defined($config_vars{'mount_args'})) { + $config_vars{'mount_args'} = $default_mount_args; + } + } + ############################################### # NOW THAT THE CONFIG FILE HAS BEEN READ IN, # # DO A SANITY CHECK ON THE DATA WE PULLED OUT # @@ -3523,7 +3536,8 @@ $linux_lvm_snapshotname = join('/', $config_vars{'linux_lvm_vgpath'}, $linux_lvmvgname, $config_vars{'linux_lvm_snapshotname'}); push(@cmd_stack, $linux_lvm_snapshotname); push(@cmd_stack, $config_vars{'linux_lvm_mountpath'}); - + push(@cmd_stack, $config_vars{'mount_args'}); + print_cmd(@cmd_stack); if (0 == $test) { $result = system(@cmd_stack); @@ -6222,6 +6236,16 @@ =back +B + +=over 4 + +List of arguments to pass to the mount command for LVM snapshots, +e.g. "-onouuid" for succesful XFS mounts. If not specified, +mount is called without arguments, which should suffice in most cases. + +=back + B [name] [number] =over 4