Mageia Bugzilla – Attachment 2281 Details for
Bug 207
can't mount NFS servers
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
Patch to tome out nfs server search
patch-add_timeout_to_fs_remote_nfs (text/plain), 1.55 KB, created by
Derek Jennings
on 2012-05-12 16:55:58 CEST
(
hide
)
Description:
Patch to tome out nfs server search
Filename:
MIME Type:
Creator:
Derek Jennings
Created:
2012-05-12 16:55:58 CEST
Size:
1.55 KB
patch
obsolete
>--- /usr/lib/libDrakX/fs/remote/nfs.pm 2011-05-26 22:57:49.000000000 +0100 >+++ nfs.pm 2012-05-12 14:26:55.000000000 +0100 >@@ -36,29 +36,28 @@ > } > > sub find_servers { >- open(my $F2, "rpcinfo-flushed -b mountd 2 |"); >- open(my $F3, "rpcinfo-flushed -b mountd 3 |"); >+ my $child2 = open(my $F2, "rpcinfo-flushed -b mountd 2 |"); >+ my $child3 = open(my $F3, "rpcinfo-flushed -b mountd 3 |"); > > 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/\.$//; >- $domain && $name =~ s/\Q.$domain\E$// >- || $name =~ s/^([^.]*)\.local$/$1/; >- $servers{$ip} ||= { ip => $ip, if_($name ne '(unknown)', name => $name) }; >- } >+ sleep 5; >+#kill the children >+ kill 'HUP', $child2; >+ kill 'HUP', $child3; >+ while ($s = <$F2> || <$F3>) { >+ my ($ip, $name) = $s =~ /(\S+)\s+(\S+)/ or log::explanations("bad line in rpcinfo output"), next; >+ $name =~ s/\.$//; >+ $domain && $name =~ s/\Q.$domain\E$// >+ || $name =~ s/^([^.]*)\.localdomain/$1/; >+ $servers{$ip} ||= { ip => $ip, if_($name ne '(unknown)', name => $name) }; > } > values %servers; > } > >+ > sub find_exports { > my ($_class, $server) = @_; > >@@ -68,4 +67,4 @@ > map { if_(/(\S+(\s*\S+)*)\s+(\S+)/, { name => $1, comment => $3, server => $server }) } @l; > } > >-1; >+1; >\ No newline at end of file
--- /usr/lib/libDrakX/fs/remote/nfs.pm 2011-05-26 22:57:49.000000000 +0100 +++ nfs.pm 2012-05-12 14:26:55.000000000 +0100 @@ -36,29 +36,28 @@ } sub find_servers { - open(my $F2, "rpcinfo-flushed -b mountd 2 |"); - open(my $F3, "rpcinfo-flushed -b mountd 3 |"); + my $child2 = open(my $F2, "rpcinfo-flushed -b mountd 2 |"); + my $child3 = open(my $F3, "rpcinfo-flushed -b mountd 3 |"); 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/\.$//; - $domain && $name =~ s/\Q.$domain\E$// - || $name =~ s/^([^.]*)\.local$/$1/; - $servers{$ip} ||= { ip => $ip, if_($name ne '(unknown)', name => $name) }; - } + sleep 5; +#kill the children + kill 'HUP', $child2; + kill 'HUP', $child3; + while ($s = <$F2> || <$F3>) { + my ($ip, $name) = $s =~ /(\S+)\s+(\S+)/ or log::explanations("bad line in rpcinfo output"), next; + $name =~ s/\.$//; + $domain && $name =~ s/\Q.$domain\E$// + || $name =~ s/^([^.]*)\.localdomain/$1/; + $servers{$ip} ||= { ip => $ip, if_($name ne '(unknown)', name => $name) }; } values %servers; } + sub find_exports { my ($_class, $server) = @_; @@ -68,4 +67,4 @@ map { if_(/(\S+(\s*\S+)*)\s+(\S+)/, { name => $1, comment => $3, server => $server }) } @l; } -1; +1; \ No newline at end of file
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 207
:
2281
|
2282
|
2315
|
2475
|
2537
|
2779
|
3385