diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-06-06 12:56:52 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-06-06 12:56:52 +0000 |
| commit | 2d64dfc9f7ef978e86a5bc07c03b683c8eb0c466 (patch) | |
| tree | 169357b61ff174f90b3832be1c9c53e18f50a2a3 /perl-install/network | |
| parent | e37dea0c173dc14d050aae60a2bdba59f7f49eb3 (diff) | |
| download | drakx-2d64dfc9f7ef978e86a5bc07c03b683c8eb0c466.tar drakx-2d64dfc9f7ef978e86a5bc07c03b683c8eb0c466.tar.gz drakx-2d64dfc9f7ef978e86a5bc07c03b683c8eb0c466.tar.bz2 drakx-2d64dfc9f7ef978e86a5bc07c03b683c8eb0c466.tar.xz drakx-2d64dfc9f7ef978e86a5bc07c03b683c8eb0c466.zip | |
- handle spaces in exported directories
- simplify using --no-headers when calling showmount
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/nfs.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/network/nfs.pm b/perl-install/network/nfs.pm index 127800ecb..d257f5346 100644 --- a/perl-install/network/nfs.pm +++ b/perl-install/network/nfs.pm @@ -55,10 +55,9 @@ sub find_exports { my ($_class, $server) = @_; my @l; - run_program::raw({ timeout => 1 }, "showmount", '>', \@l, "-e", $server->{ip} || $server->{name}); + run_program::raw({ timeout => 1 }, "showmount", '>', \@l, "--no-headers", "-e", $server->{ip} || $server->{name}); - shift @l; #- drop first line - map { if_(/(\S+)\s*(\S+)/, { name => $1, comment => $2, server => $server }) } @l; + map { if_(/(\S+(\s*\S+)*)\s+(\S+)/, { name => $1, comment => $3, server => $server }) } @l; } 1; |