]>
Commit | Line | Data |
---|---|---|
eeb7d282 | 1 | --- captive-1.1.5/src/client/lufs/mount.captive.in.orig 2003-12-02 18:23:19.000000000 +0100 |
2 | +++ captive-1.1.5/src/client/lufs/mount.captive.in 2005-03-26 23:19:21.163928008 +0100 | |
4ad4505c | 3 | @@ -28,8 +28,7 @@ |
4 | my $vardir='@localstatedir@/lib/captive'; | |
5 | $vardir=~s#\$\Q{prefix}\E#'@prefix@';#ge; | |
6 | $vardir="/var/lib/captive" if $vardir=~/^@/; | |
7 | -my $lufsd_bin='@PATH_LUFSD@'; | |
8 | -$lufsd_bin="/usr/bin/lufsd" if $lufsd_bin=~/^@/; | |
9 | +my $lufsd_bin="/usr/bin/lufis"; | |
10 | my $captive_sandbox_server_bin='@sbindir@/captive-sandbox-server'; | |
11 | $captive_sandbox_server_bin=~s#\$\Q{exec_prefix}\E#'@exec_prefix@';#ge; | |
12 | $captive_sandbox_server_bin=~s#\$\Q{prefix}\E#'@prefix@';#ge; | |
eeb7d282 | 13 | @@ -128,8 +127,10 @@ |
14 | ||
4ad4505c | 15 | warn "$0: '-n' not supported - ignored" if $nomtab; |
16 | ||
eeb7d282 | 17 | +my $fuseopts="-oallow_other,fsname=$image"; |
18 | + | |
4ad4505c | 19 | # Use "'$oo'" to permit another expansion by bash(1) during lufsmnt(8) execution. |
20 | -my @argv=($lufsd_bin,"none",$dir,"-o",$oo); | |
eeb7d282 | 21 | +my @argv=($lufsd_bin,$oo,$dir,"-s",$fuseopts); |
4ad4505c | 22 | |
23 | print STDERR "$0: @argv\n" if $verbose; | |
24 | exec $lufsd_bin @argv; |