summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2003-03-06 15:48:29 +0000
committerFlorent Villard <warly@mandriva.com>2003-03-06 15:48:29 +0000
commitd2183f2a4e253abe2066484f2d997147bde27e60 (patch)
treeb1d9e9c30b2cd2a723088bc4c083d6f60f1a593a
parent943d207aba5013c54a6bdc25c8c8718610718624 (diff)
downloaddrakx-d2183f2a4e253abe2066484f2d997147bde27e60.tar
drakx-d2183f2a4e253abe2066484f2d997147bde27e60.tar.gz
drakx-d2183f2a4e253abe2066484f2d997147bde27e60.tar.bz2
drakx-d2183f2a4e253abe2066484f2d997147bde27e60.tar.xz
drakx-d2183f2a4e253abe2066484f2d997147bde27e60.zip
detect if the device is pcmcia when initializing the ONBOOT parameter
-rw-r--r--perl-install/network/network.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index b17b102d9..22d763ea2 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -326,7 +326,7 @@ Each item should be entered as an IP address in dotted-decimal
notation (for example, 1.2.3.4).");
}
my $auto_ip = $intf->{BOOTPROTO} !~ /static/;
- my $onboot = $intf->{ONBOOT} !~ /no/;
+ my $onboot = $intf->{ONBOOT} ? $intf->{ONBOOT} =~ /yes/ : bool2yesno(!member($intf->{DEVICE}, map { $_->{device} } detect_devices::pcmcia_probe()));
my $needhostname = $intf->{NEEDHOSTNAME} !~ /no/;
my $hotplug = $::isStandalone && !$intf->{MII_NOT_SUPPORTED} or 1;
my $track_network_id = $::isStandalone && $intf->{HWADDR} or detect_devices::isLaptop();