diff options
| author | damien <damien@mandriva.com> | 2001-09-11 17:39:13 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-09-11 17:39:13 +0000 |
| commit | 7427e6d01fbc73c49b0ec5c0b576e718de761ac2 (patch) | |
| tree | b3e619ccc2db80b91e53f27c6110a3fa03dd6362 /perl-install/network/ethernet.pm | |
| parent | 6010c5693eff384e6b559b7e1577097b8ae1d510 (diff) | |
| download | drakx-backup-do-not-use-7427e6d01fbc73c49b0ec5c0b576e718de761ac2.tar drakx-backup-do-not-use-7427e6d01fbc73c49b0ec5c0b576e718de761ac2.tar.gz drakx-backup-do-not-use-7427e6d01fbc73c49b0ec5c0b576e718de761ac2.tar.bz2 drakx-backup-do-not-use-7427e6d01fbc73c49b0ec5c0b576e718de761ac2.tar.xz drakx-backup-do-not-use-7427e6d01fbc73c49b0ec5c0b576e718de761ac2.zip | |
don't detect ethx if no autodetection.
implement smarter checkboxes
Diffstat (limited to 'perl-install/network/ethernet.pm')
| -rw-r--r-- | perl-install/network/ethernet.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index fe2d0dd96..7becd4a69 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -63,9 +63,9 @@ sub configure_lan { configureNetwork2($in, $prefix, $netc, $intf); if ($::isStandalone and ($::expert or $in->ask_yesorno(_("Network configuration"), _("Do you want to restart the network"), 1))) { - run_program::rooted($prefix, "/etc/rc.d/init.d/network stop"); - if (!run_program::rooted($prefix, "/etc/rc.d/init.d/network start")) { - $in->ask_okcancel(_("Network Configuration"), _("A problem occured while restarting the network: \n\n%s", `/etc/rc.d/init.d/network start`), 0) or return; +#- run_program::rooted($prefix, "/etc/rc.d/init.d/network stop"); + if (!run_program::rooted($prefix, "/etc/rc.d/init.d/network restart")) { + $in->ask_okcancel(_("Network Configuration"), _("A problem occured while restarting the network: \n\n%s", `/etc/rc.d/init.d/network restart`), 0) or return; } } $netc->{NETWORKING} = "yes"; @@ -181,7 +181,7 @@ sub go_ethernet { sub configureNetwork { my ($netc, $intf, $first_time) = @_; local $_; - any::setup_thiskind($in, 'net', !$::expert, 1); + any::setup_thiskind($in, 'net', !$::expert, 1) if $netc->{autodetection}; my @l = detect_devices::getNet() or die _("no network card found"); my @all_cards = conf_network_card_backend ($netc, $intf, undef, undef, undef, undef); |