From 30d91c3e71986c50b29dd782532e6c064a168bd3 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 23 Jul 2004 12:55:42 +0000
Subject: hey, I suck, that's DIAL_ON_IFUP, not DIAL_ON_BOOT

---
 perl-install/network/netconnect.pm | 10 +++++-----
 perl-install/network/network.pm    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'perl-install/network')

diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index c5266513e..254d0ed44 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -1181,14 +1181,14 @@ It is not necessary on most networks."),
                     pre => sub {
                         $intf->{ippp0} ||= { DEVICE => "ippp0" }; # we want the ifcfg-ippp0 file to be written
                         @isdn_dial_methods = ({ name => N("Automatically at boot"),
-                                                ONBOOT => 1, DIAL_ON_BOOT => 1 },
+                                                ONBOOT => 1, DIAL_ON_IFUP => 1 },
                                               { name => N("By using Net Applet in the system tray"),
-                                                ONBOOT => 0, DIAL_ON_BOOT => 1 },
+                                                ONBOOT => 0, DIAL_ON_IFUP => 1 },
                                               { name => N("Manually (the interface would still be activated at boot)"),
-                                               ONBOOT => 1, DIAL_ON_BOOT => 0 });
+                                               ONBOOT => 1, DIAL_ON_IFUP => 0 });
                         my $method =  find {
                             $_->{ONBOOT} eq text2bool($intf->{ippp0}{ONBOOT}) &&
-                              $_->{DIAL_ON_BOOT} eq text2bool($intf->{ippp0}{DIAL_ON_BOOT})
+                              $_->{DIAL_ON_IFUP} eq text2bool($intf->{ippp0}{DIAL_ON_IFUP})
                         } @isdn_dial_methods;
                         #- use net_applet by default
                         $isdn->{dial_method} = $method->{name} || $isdn_dial_methods[1]{name};
@@ -1199,7 +1199,7 @@ It is not necessary on most networks."),
                     },
                     post => sub {
                         my $method = find { $_->{name} eq $isdn->{dial_method} } @isdn_dial_methods;
-                        $intf->{ippp0}{$_} = bool2yesno($method->{$_}) foreach qw(ONBOOT DIAL_ON_BOOT);
+                        $intf->{ippp0}{$_} = bool2yesno($method->{$_}) foreach qw(ONBOOT DIAL_ON_IFUP);
                         return $after_start_on_boot_step->();
                     },
                    },
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index f75d61c9a..1af6b6a44 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -167,7 +167,7 @@ sub write_interface_conf {
     setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR MII_NOT_SUPPORTED), 
                 qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV),
                 if_($intf->{BOOTPROTO} eq "dhcp", qw(DHCP_HOSTNAME NEEDHOSTNAME)),
-                if_($intf->{DEVICE} =~ /^ippp\d+$/, qw(DIAL_ON_BOOT))
+                if_($intf->{DEVICE} =~ /^ippp\d+$/, qw(DIAL_ON_IFUP))
                );
     log::explanations("written $intf->{DEVICE} interface configuration in $file");
 }
-- 
cgit v1.2.1