summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-01-07 19:05:33 +0000
committerOlivier Blin <oblin@mandriva.com>2009-01-07 19:05:33 +0000
commitc5ac1412e3e7edbbd3a5dfc0cdeff71b11660e2a (patch)
treeaa910415e32afb73bd76fc13e37b41665fd012cb
parent12eb78bd3f6574ec2cb30f1bda04915f50b51d2f (diff)
downloaddrakx-c5ac1412e3e7edbbd3a5dfc0cdeff71b11660e2a.tar
drakx-c5ac1412e3e7edbbd3a5dfc0cdeff71b11660e2a.tar.gz
drakx-c5ac1412e3e7edbbd3a5dfc0cdeff71b11660e2a.tar.bz2
drakx-c5ac1412e3e7edbbd3a5dfc0cdeff71b11660e2a.tar.xz
drakx-c5ac1412e3e7edbbd3a5dfc0cdeff71b11660e2a.zip
lookup for Samba master browsers too
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/remote/smb.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 771e56f6b..088a23a85 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -52,6 +52,8 @@ Version 11.72 - 9 December 2008
* try harder to find duplicates
- ugtk2:
o allow showing Skip button instead of Cancel in wizards
+- diskdrake:
+ o lookup for Samba master browsers too
Version 11.71 - 6 November 2008
diff --git a/perl-install/fs/remote/smb.pm b/perl-install/fs/remote/smb.pm
index 7757eeb3f..1399d2f62 100644
--- a/perl-install/fs/remote/smb.pm
+++ b/perl-install/fs/remote/smb.pm
@@ -53,7 +53,7 @@ sub smbclient {
}
sub find_servers {
- my (undef, @l) = `nmblookup "*"`;
+ my (undef, @l) = `nmblookup "*"; nmblookup -M -- -`;
s/\s.*\n// foreach @l;
require network::network;
my @servers = grep { network::network::is_ip($_) } @l;