summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-13 22:03:33 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-13 22:03:33 +0000
commit23c152b7d199b290607b3d3e3a14d76dbaa60e90 (patch)
tree495014e3fa3d0e8266f5d243381bbcbb94ae35be /perl-install/install_steps_interactive.pm
parentb121ba06131e915ff2dd837c8d7d0bd13fb3ac40 (diff)
downloaddrakx-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar
drakx-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar.gz
drakx-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar.bz2
drakx-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar.xz
drakx-23c152b7d199b290607b3d3e3a14d76dbaa60e90.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm10
1 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 4bb7e6aab..6bff4e7ff 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -35,6 +35,10 @@ sub errorInStep($$) {
$o->ask_warn(_("Error"), [ _("An error occurred"), $err ]);
}
+sub kill_action {
+ my ($o) = @_;
+ $o->kill;
+}
#-######################################################################################
#- Steps Functions
@@ -175,7 +179,7 @@ _("Please enter the IP configuration for this machine.
Each item should be entered as an IP address in dotted-decimal
notation (for example, 1.2.3.4)."),
[ _("IP address:"), _("Netmask:")],
- [ \$intf->{IPADDR}, \$intf->{NETMASK}],
+ [ \$intf->{IPADDR}, \$intf->{NETMASK} ],
complete => sub {
for (my $i = 0; $i < @fields; $i++) {
unless (network::is_ip($intf->{$fields[$i]})) {
@@ -202,7 +206,7 @@ _("Please enter your host name.
Your host name should be a fully-qualified host name,
such as ``mybox.mylab.myco.com''.
Also give the gateway if you have one"),
- [_("Host name:"), _("DNS server:"), _("Gateway:"), _("Gateway device:")],
+ [_("Host name:"), _("DNS server:"), _("Gateway:"), !$::beginner ? _("Gateway device:") : ()],
[(map { \$netc->{$_}} qw(HOSTNAME dnsServer GATEWAY)),
{val => \$netc->{GATEWAYDEV}, list => \@devices}]
);
@@ -214,7 +218,7 @@ sub timeConfig {
$o->{timezone}{GMT} = $o->ask_yesorno('', _("Is your hardware clock set to GMT?"), $o->{timezone}{GMT});
$o->{timezone}{timezone} ||= timezone::bestTimezone(lang::lang2text($o->{lang}));
- $o->{timezone}{timezone} = $o->ask_from_list('', _("In which timezone are you"), [ timezone::getTimeZones($o->{prefix}) ], $o->{timezone}{timezone});
+ $o->{timezone}{timezone} = $o->ask_from_list('', _("In which timezone are you"), [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone});
install_steps::timeConfig($o,$f);
}