summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-10-24 14:36:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-10-24 14:36:29 +0000
commitefad0d7f1e0efb1c7d6f8bb49bd7191ecdb59cd3 (patch)
treea0f879d55fdab1f0fc54a2fb62cca47b3c654dfb
parente66787e8ef47e098c04ea5595ad745304955d34d (diff)
downloaddrakx-efad0d7f1e0efb1c7d6f8bb49bd7191ecdb59cd3.tar
drakx-efad0d7f1e0efb1c7d6f8bb49bd7191ecdb59cd3.tar.gz
drakx-efad0d7f1e0efb1c7d6f8bb49bd7191ecdb59cd3.tar.bz2
drakx-efad0d7f1e0efb1c7d6f8bb49bd7191ecdb59cd3.tar.xz
drakx-efad0d7f1e0efb1c7d6f8bb49bd7191ecdb59cd3.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 b7a38e8ff..dd5f55bf1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- bootloader-config must not need network::network from libdrakx-net
- fix buttons order under KDE when using compiz (by detecting kde-window-decorator)
- drakclock/finish-install: disable DPMS and screensaver when setting time,
not to blank monitor (#17031)
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;