drop Storable and use Dumper (queen & pipi rulez)

2 files changed, 8 insertions, 5 deletions

diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 14f5ba463..12b41a8f4 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -11,7 +11,6 @@ use mouse;
 use network::network;
 use network::tools;
 use MDK::Common::Globals "network", qw($in);
-use Storable qw(store retrieve);
 
 sub detect {
     my ($auto_detect, $o_class) = @_;
@@ -90,7 +89,8 @@ sub get_subwizard {
       my $ethntf = {};
       my $db_path = "/usr/share/apps/kppp/Provider";
       my (%countries, @isp, $country, $provider, $old_provider);
-      my $config = -f '/etc/sysconfig/drakconnect' ? Storable::retrieve('/etc/sysconfig/drakconnect') : {};
+      my $config = {};
+      eval(cat_('/etc/sysconfig/drakconnect'));
 
       my %wireless_mode = (N("Ad-hoc") => "Ad-hoc", 
                            N("Managed") => "Managed", 
@@ -1009,7 +1009,10 @@ You may also enter the IP address of the gateway if you have one."),
                    {
                     name => N("Configuration is complete, do you want to apply settings ?"),
                     type => "yesorno",
-                    post => sub { Storable::store($config, '/etc/sysconfig/drakconnect'); "network_on_boot" },
+                    post => sub {
+			require Data::Dumper;
+			output('/etc/sysconfig/drakconnect', Data::Dumper->Dump([$config], ['$config']));
+			"network_on_boot" },
                    },
                    
                    network_on_boot => 
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 0aa4bb9b1..2551b0240 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -40,7 +40,6 @@ use network::isdn;
 use network::adsl;
 use MDK::Common::Globals "network", qw($in);
 use POSIX ":sys_wait_h";
-use Storable qw(store retrieve);
 
 my ($netcnx, $netc, $intf)  = ({}, {}, {});
 #my @conx_type = ('modem', 'isdn_internal', 'isdn_external', 'adsl', 'cable', 'lan');
@@ -194,7 +193,8 @@ sub manage {
     $notebook->set_property('show-border', 0);
     my $apply_button;
   
-    my $config = -f '/etc/sysconfig/drakconnect' ? Storable::retrieve('/etc/sysconfig/drakconnect') : {};
+    my $config = {};
+    eval(cat_('/etc/sysconfig/drakconnect'));
 
     #- duplicated from network::ethernet, to be factorized
     @all_cards = network::ethernet::get_eth_cards();