summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-10-24 14:37:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-10-24 14:37:17 +0000
commit35a6abdf24aa707237aadda507c6c2ed27c91490 (patch)
tree1a9145746d8bf9bd1bedb3fa43e9e991b4aa7818
parent6c714597ea6ba89cd9b78162aa1554705d335e64 (diff)
downloaddrakx-backup-do-not-use-35a6abdf24aa707237aadda507c6c2ed27c91490.tar
drakx-backup-do-not-use-35a6abdf24aa707237aadda507c6c2ed27c91490.tar.gz
drakx-backup-do-not-use-35a6abdf24aa707237aadda507c6c2ed27c91490.tar.bz2
drakx-backup-do-not-use-35a6abdf24aa707237aadda507c6c2ed27c91490.tar.xz
drakx-backup-do-not-use-35a6abdf24aa707237aadda507c6c2ed27c91490.zip
- bootloader-config must not need network::network from libdrakx-net
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs/remote/smb.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c1072a976..1b226f5ff 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- bootloader-config must not need network::network from libdrakx-net
- localedrake:
o do propose "Suisse" after selecting french language (#34675)
- draksec:
diff --git a/perl-install/fs/remote/smb.pm b/perl-install/fs/remote/smb.pm
index 933941326..7757eeb3f 100644
--- a/perl-install/fs/remote/smb.pm
+++ b/perl-install/fs/remote/smb.pm
@@ -5,7 +5,6 @@ use diagnostics;
use common;
use fs::mount_options;
-use network::network;
use fs::remote;
@@ -56,6 +55,7 @@ sub smbclient {
sub find_servers {
my (undef, @l) = `nmblookup "*"`;
s/\s.*\n// foreach @l;
+ require network::network;
my @servers = grep { network::network::is_ip($_) } @l;
my %servers;
$servers{$_}{ip} = $_ foreach @servers;