No more use of drakconnect_conf, use of IFCFG.pm instead of DrakconnectConf.pm

1 files changed, 26 insertions, 8 deletions

diff --git a/client_wizard/scripts/Clientconf.pm b/client_wizard/scripts/Clientconf.pm
index d7bceb64..3b480b3f 100644
--- a/client_wizard/scripts/Clientconf.pm
+++ b/client_wizard/scripts/Clientconf.pm
@@ -1,18 +1,36 @@
 #!/usr/bin/perl
 
+# Drakwizard
+
+# Copyright (C) 2002 MandrakeSoft Arnaud Desmons <adesmons@mandrakesoft.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
 package Clientconf;
 require "__WIZ_HOME__/common/scripts/Vareqval.pm";
-require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
+require "__WIZ_HOME__/common/scripts/IFCFG.pm";
 use MDK::Common;
 use strict;
 use standalone;
 
-my $o = DrakconnectConf->new();
-my $wiz_domain_name = $o->get("DomainName"); 
-my $wiz_ip_server = $o->get_from_known_dev("IP");
+my $o = IFCFG->new();
+my $wiz_domain_name = $o->network_get("DOMAINNAME");
+my $wiz_ip_server = $o->itf_get("IPADDR");
 
 sub	name {
-    $o->get("SystemName"); 
+    $o->network_get("HOSTNAME");
 }
 
 sub	ip {
@@ -36,9 +54,9 @@ sub	get_root {
 
 sub	up_serial {
     my	($file) = @_;
-    
+
     my	$serial_nbm = `date +%Y%m%d00` or die "date not found: $!";
-    output($file, map { 
+    output($file, map {
 	my $line = $_;
 	if (/^(\s*)(\d*)(\s*;\s*Serial.*)$/) {
 	    my $serial_f = $2;
@@ -76,7 +94,7 @@ sub	do_it {
     my $s_trunc = "$1.$2.$3" if $wiz_ip_server =~ /(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/;
     my $ds = "$4" if $wiz_ip_server =~ /(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/;
     my $dc = "$4" if $ENV{wiz_client_ip} =~ /(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/;
-   
+
     my $file="/var/named/$wiz_domain_name.db";
     MDK::Common::cp_af($file, $file.".orig");
     open(NEW, ">> $file")	or die "can not open $file";