1 files changed, 16 insertions, 22 deletions
diff --git a/perl-install/network/nfs.pm b/perl-install/network/nfs.pm
index 39faa716e..87f336e36 100644
--- a/perl-install/network/nfs.pm
+++ b/perl-install/network/nfs.pm
@@ -29,41 +29,35 @@ sub to_dev_raw {
 
 sub check {
     my ($_class, $in) = @_;
-    $in->do_pkgs->ensure_is_installed('nfs-utils-clients', '/usr/sbin/showmount') or return;
-    system('/etc/init.d/portmap start') if system('/etc/init.d/portmap status') != 0;
-    1;
+    $in->do_pkgs->ensure_is_installed('nfs-utils-clients', '/usr/sbin/showmount');
 }
 
 sub find_servers {
-    open(my $F2, "rpcinfo-flushed -b mountd 2 |");
-    open(my $F3, "rpcinfo-flushed -b mountd 3 |");
+    my $pid = open(my $F, "rpcinfo-flushed -b mountd 2 |");
+    $SIG{ALRM} = sub { kill(15, $pid) };
+    alarm 1;
 
-    common::nonblock($F2);
-    common::nonblock($F3);
     my $domain = chomp_(`domainname`);
-    my ($s, %servers);
-    my $quit;
-    while (!$quit) {
-	$quit = 1;
-	sleep 1;
-	while ($s = <$F2> || <$F3>) {
-	    $quit = 0;
-	    my ($ip, $name) = $s =~ /(\S+)\s+(\S+)/ or log::explanations("bad line in rpcinfo output"), next;
-	    $name =~ s/\.$//;
-	    $name =~ s/\Q.$domain\E$//;
-	    $servers{$ip} ||= { ip => $ip, if_($name ne '(unknown)', name => $name) };
-	}
+    my @servers;
+    local $_;
+    while (<$F>) {
+	chomp;
+	my ($ip, $name) = /(\S+)\s+(\S+)/ or log::l("bad line in rpcinfo output"), next;
+	$name =~ s/\Q.$domain//; 
+	$name =~ s/\.$//;
+	push @servers, { ip => $ip, if_($name ne '(unknown)', name => $name) };
     }
-    values %servers;
+    @servers;
 }
 
 sub find_exports {
     my ($_class, $server) = @_;
 
     my @l;
-    run_program::raw({ timeout => 1 }, "showmount", '>', \@l, "--no-headers", "-e", $server->{ip} || $server->{name});
+    run_program::raw({ timeout => 1 }, "showmount", '>', \@l, "-e", $server->{ip} || $server->{name});
 
-    map { if_(/(\S+(\s*\S+)*)\s+(\S+)/, { name => $1, comment => $3, server => $server }) } @l;
+    shift @l; #- drop first line
+    map { /(\S+)\s*(\S+)/; { name => $1, comment => $2, server => $server } } @l;
 }
 
 1;