--- a/bin/ftbackup Tue Aug 02 11:23:00 2011 +0200
+++ b/bin/ftbackup Tue Aug 02 11:23:20 2011 +0200
@@ -519,7 +519,7 @@
open(my $f, "+>>" => $file) or LOGDIE "Can't open $file: $!\n";
seek($f, 0, 0);
my $_ = join "", <$f>;
- s/^$from\s/$to /mg;
+ s/^\Q$from\E\s/$to /mg;
truncate($f, 0);
print $f $_;
close($f);
@@ -527,14 +527,19 @@
sub real_device($) {
my $dev = shift;
+ my $rdev;
if ($dev ~~ /^(LABEL|UUID)=/) {
# NOTE: dump is able to handle LABEL=... too, but I think
# it's more easy for recovery to know the real device
- chomp($dev = `blkid -c /dev/null -o device -t '$dev'`);
+ $rdev = `blkid -c /dev/null -o device -t '$dev'`;
}
- $dev = realpath($dev);
+ else {
+ $rdev = `blkid -c /dev/null -o device '$dev'`;
+ }
+ chomp $rdev if $rdev;
+ return $rdev;
}
sub devno($) {