summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorFlorin Grad <florin@mandriva.com>2003-03-03 19:35:08 +0000
committerFlorin Grad <florin@mandriva.com>2003-03-03 19:35:08 +0000
commit23a45705bb6dc54ae9cfce287c72c362b094dd94 (patch)
tree6f7502efc0b1f5f04a2a77c33901b7b0f7da60bc /perl-install/standalone
parent8d79020e705d45506e330d3a87bb791fa97c017c (diff)
downloaddrakx-23a45705bb6dc54ae9cfce287c72c362b094dd94.tar
drakx-23a45705bb6dc54ae9cfce287c72c362b094dd94.tar.gz
drakx-23a45705bb6dc54ae9cfce287c72c362b094dd94.tar.bz2
drakx-23a45705bb6dc54ae9cfce287c72c362b094dd94.tar.xz
drakx-23a45705bb6dc54ae9cfce287c72c362b094dd94.zip
add an extra first choose the net device step
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakgw13
1 files changed, 12 insertions, 1 deletions
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 5517ba53e..d6da474c0 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -198,9 +198,20 @@ my @configured_devices = map { /ifcfg-(\S+)/ } glob('/etc/sysconfig/network-scri
my %aliased_devices;
/^\s*alias\s+(eth[0-9])\s+(\S+)/ and $aliased_devices{$1} = $2 foreach cat_("/etc/modules.conf");
-my $card_netconnect = network::netconnect::get_net_device();
+my $card_netconnect = network::netconnect::get_net_device() ? network::netconnect::get_net_device() : "eth0";
defined $card_netconnect and log::l("[drakgw] Information from netconnect: ignore card $card_netconnect");
+ $in->ask_from('',
+ N("Please enter the name of the interface connected to the internet.
+
+Examples:
+ ppp+ for modem or DSL connections,
+ eth0, or eth1 for cable connection,
+ ippp+ for a isdn connection.
+", $card_netconnect),
+ [ { label => N("Net Device"), val => \$card_netconnect, type => 'entry' } ])
+ or goto step_warning_already_conf;
+
my @cards = grep {
log::l("[drakgw] Have network card: $_");
$_ ne $card_netconnect