diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-12-16 15:20:06 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-12-16 15:20:06 +0000 |
| commit | 747c271571c5ab11581ac4f2a7202e6bc408f217 (patch) | |
| tree | d832df72b6f6281426a8e92956405ab314e41389 | |
| parent | 8a21162610636c7e12e20288c40b0965dea16fb4 (diff) | |
| download | drakx-747c271571c5ab11581ac4f2a7202e6bc408f217.tar drakx-747c271571c5ab11581ac4f2a7202e6bc408f217.tar.gz drakx-747c271571c5ab11581ac4f2a7202e6bc408f217.tar.bz2 drakx-747c271571c5ab11581ac4f2a7202e6bc408f217.tar.xz drakx-747c271571c5ab11581ac4f2a7202e6bc408f217.zip | |
- diskdrake:
o --nfs: handle domainname not set
(reported somewhere, but can't find where...)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/fs/remote/nfs.pm | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 27ceb3b47..5b5853f2f 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -3,6 +3,7 @@ mkinitrd fails (#44862) - diskdrake: o --nfs: handle "host:/" (#44320) + o --nfs: handle domainname not set Version 11.73 - 15 December 2008 diff --git a/perl-install/fs/remote/nfs.pm b/perl-install/fs/remote/nfs.pm index 7acddb730..816c152a5 100644 --- a/perl-install/fs/remote/nfs.pm +++ b/perl-install/fs/remote/nfs.pm @@ -51,7 +51,8 @@ sub find_servers { $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$//; + $domain && $name =~ s/\Q.$domain\E$// + || $name =~ s/^([^.]*)\.local$/$1/; $servers{$ip} ||= { ip => $ip, if_($name ne '(unknown)', name => $name) }; } } |