summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-06-02 03:20:37 +0000
committerOlivier Blin <oblin@mandriva.org>2005-06-02 03:20:37 +0000
commit1c2b5f95b004701f15fdad21d318e0004cc71e6f (patch)
tree1e87ee333aed21bc601e63a47cf627ac11648c71
parent5a97d4485abc4b903a6bda0491039fc8ec475b09 (diff)
downloaddrakx-backup-do-not-use-1c2b5f95b004701f15fdad21d318e0004cc71e6f.tar
drakx-backup-do-not-use-1c2b5f95b004701f15fdad21d318e0004cc71e6f.tar.gz
drakx-backup-do-not-use-1c2b5f95b004701f15fdad21d318e0004cc71e6f.tar.bz2
drakx-backup-do-not-use-1c2b5f95b004701f15fdad21d318e0004cc71e6f.tar.xz
drakx-backup-do-not-use-1c2b5f95b004701f15fdad21d318e0004cc71e6f.zip
fix netprofile stuff
-rw-r--r--globetrotter/hwprofile12
1 files changed, 5 insertions, 7 deletions
diff --git a/globetrotter/hwprofile b/globetrotter/hwprofile
index d84073394..a3b0574dd 100644
--- a/globetrotter/hwprofile
+++ b/globetrotter/hwprofile
@@ -21,26 +21,24 @@ use lib qw(/usr/lib/libDrakX);
use common;
use standalone;
use Digest::MD5 qw(md5_hex);
-use network::tools;
-use network::netconnect;
+use network::network;
# md5_hex call came from move::machine_ident() :
my $id = "MDK" . md5_hex(join("", (map { (split)[1] } cat_("/proc/bus/pci/devices"))));
-my $netcnx = {};
+my $net = {};
# first boot wizard:
!glob_("/etc/netprofile/profiles/MDK*") and system('/usr/sbin/mdkmove');
# create hardware profile if needed:
if (! -d "/etc/netprofile/profiles/$id") {
- network::tools::reread_net_conf($netcnx, {}, {});
- network::netconnect::add_profile($netcnx, $id);
+ network::network::netprofile_read($net);
+ network::network::netprofile_add($net, $id);
}
# restore hardware profile:
-$netcnx->{PROFILE} = $id;
-eval { network::netconnect::set_profile($netcnx) };
+eval { network::network::netprofile_set($net, $id) };
# redo ldconfig cache for libGL (since we've both ATI and NVIDIA GLX packages):
system("/sbin/ldconfig");