summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-08-29 20:15:36 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-08-29 20:15:36 +0000
commitd5e061896a35a49a50124949c2882ac9cbe94589 (patch)
tree920e7af830e2aa3a766dba5b7aacdca4a6b50a44 /perl-install/install_steps_interactive.pm
parentc05cafad9c601272884cf75ee4e056bfbf4b2917 (diff)
downloaddrakx-backup-do-not-use-d5e061896a35a49a50124949c2882ac9cbe94589.tar
drakx-backup-do-not-use-d5e061896a35a49a50124949c2882ac9cbe94589.tar.gz
drakx-backup-do-not-use-d5e061896a35a49a50124949c2882ac9cbe94589.tar.bz2
drakx-backup-do-not-use-d5e061896a35a49a50124949c2882ac9cbe94589.tar.xz
drakx-backup-do-not-use-d5e061896a35a49a50124949c2882ac9cbe94589.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ca46629a7..52bedcd81 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -35,7 +35,7 @@ sub chooseLanguage($) {
sub selectInstallOrUpgrade($) {
my ($o) = @_;
$o->ask_from_list_(_("Install/Upgrade"),
- _("Is it an install or an upgrade?"),
+ _("Is this an install or an upgrade?"),
[ __("Install"), __("Upgrade") ],
$o->default("isUpgrade") ? "Upgrade" : "Install") eq "Upgrade";
}
@@ -124,7 +124,7 @@ sub configureNetwork($) {
}
if ($r !~ /^Keep/) {
- my @l = first(network::getNet());
+ my @l = network::getNet() or return die _("no network card found");
@l = ($l[0]) unless $::expert; # keep only one
$o->configureNetworkIntf(network::findIntf($o->{intf}, $_)) foreach @l;
@@ -157,7 +157,7 @@ _("Choose the floppy drive you want to use to make the bootdisk"),
\@l, $o->default("mkbootdisk"));
}
- $o->ask_warn('', _("Insert a floppy in floppy drive %s", $o->{mkbootdisk}));
+ $o->ask_warn('', _("Insert a floppy in drive %s", $o->{mkbootdisk}));
my $w = $o->wait_message('', _("Creating bootdisk"));
$o->SUPER::createBootdisk;
}