Don't allow a slash to be specified in a module name.

[rsync/rsync.git] / support / mnt-excl

diff --git a/support/mnt-excl b/support/mnt-excl
index 7597f63..5514d96 100755 (executable)
--- a/support/mnt-excl
+++ b/support/mnt-excl
@@ -8,6 +8,7 @@
 #
 # mnt-excl /dir | rsync --exclude-from=- ... /dir /dest/
 # mnt-excl /dir/ | rsync --exclude-from=- ... /dir/ /dest/
+# ssh host mnt-excl /dir | rsync --exclude-from=- ... host:/dir /dest/
 #
 # Imagine that /dir/foo is a mount point: the first invocation of
 # mnt-excl would have output /dir/foo, while the second would have
@@ -15,10 +16,18 @@
 #
 # NOTE:  This script expects /proc/mounts to exist, but could be
 # easily adapted to read /etc/mtab or similar.
+#
+# ADDENDUM:  The addition of the --filter option (which has support for
+# absolute-anchored excludes) has made this script less useful than it
+# was.  Beginning with 2.6.4, you can achieve the effect of this script
+# through this command:
+#
+# awk '{print $2}' /proc/mounts | rsync -f 'merge,/- -' host:/dir /dest/
 
 use strict;
 use Cwd 'abs_path';
 
+my $file = '/proc/mounts';
 my $dir = shift || '/';
 $dir = abs_path($dir);
 $dir =~ s#([^/]*)$##;
@@ -26,7 +35,7 @@ my $trailing = $1;
 $trailing = '' if $trailing eq '.' || !-d "$dir$trailing";
 $trailing .= '/' if $trailing ne '';
 
-open(IN, '/proc/mounts') or die $!;
+open(IN, $file) or die "Unable to open $file: $!\n";
 while (<IN>) {
     $_ = (split)[1];
     next unless s#^\Q$dir$trailing\E##o && $_ ne '';