summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs/remote/nfs.pm3
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) };
}
}