summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-07-23 12:55:42 +0000
committerOlivier Blin <oblin@mandriva.org>2004-07-23 12:55:42 +0000
commit30d91c3e71986c50b29dd782532e6c064a168bd3 (patch)
tree2be1ae6b053b15d83d20491b19e101f109b2b343
parent0b671cefde50a8d50cf5df3653ea923bc904ea15 (diff)
downloaddrakx-30d91c3e71986c50b29dd782532e6c064a168bd3.tar
drakx-30d91c3e71986c50b29dd782532e6c064a168bd3.tar.gz
drakx-30d91c3e71986c50b29dd782532e6c064a168bd3.tar.bz2
drakx-30d91c3e71986c50b29dd782532e6c064a168bd3.tar.xz
drakx-30d91c3e71986c50b29dd782532e6c064a168bd3.zip
hey, I suck, that's DIAL_ON_IFUP, not DIAL_ON_BOOT
-rw-r--r--perl-install/network/netconnect.pm10
-rw-r--r--perl-install/network/network.pm2
2 files changed, 6 insertions, 6 deletions
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");
}