From 2d64dfc9f7ef978e86a5bc07c03b683c8eb0c466 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 6 Jun 2003 12:56:52 +0000 Subject: - handle spaces in exported directories - simplify using --no-headers when calling showmount --- perl-install/network/nfs.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'perl-install/network/nfs.pm') 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; -- cgit v1.2.1