Initial original import from: fuse-2.4.2-2.fc4
[captive.git] / src / client / lufs / mount.captive.in
index 09e52bf..3e0a47f 100755 (executable)
@@ -30,10 +30,10 @@ $vardir=~s#\$\Q{prefix}\E#'@prefix@';#ge;
 $vardir="/var/lib/captive" if $vardir=~/^@/;
 my $lufsd_bin='@PATH_LUFSD@';
 $lufsd_bin="/usr/bin/lufsd" if $lufsd_bin=~/^@/;
-my $captive_sandbox_server_bin='@sbindir@/captive-sandbox-server';
+my $captive_sandbox_server_bin='@libexecdir@/captive-sandbox-server';
 $captive_sandbox_server_bin=~s#\$\Q{exec_prefix}\E#'@exec_prefix@';#ge;
 $captive_sandbox_server_bin=~s#\$\Q{prefix}\E#'@prefix@';#ge;
-$captive_sandbox_server_bin="/usr/sbin/captive-sandbox-server" if $captive_sandbox_server_bin=~/^@/;
+$captive_sandbox_server_bin="/usr/libexec/captive-sandbox-server" if $captive_sandbox_server_bin=~/^@/;
 
 
 my $ME=($0=~m#([^/]*)$#)[0] or die "Cannot detetect my basename from: $0";
@@ -90,8 +90,6 @@ if ($fsname eq "ntfs") {
        for my $fh (*STDERR,*STDOUT) {
                if (-t $fh) {
                        print $fh 'Captive NTFS v@VERSION@.  Check a new version at: http://www.jankratochvil.net/'."\n";
-                       print $fh 'Captive forces MS-Windows to run safety chkdsk during the next MS-Windows boot.'."\n"
-                                       if $opt_rwmode ne "--ro";
                        last;
                        }
                }