summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-04 22:43:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-04 22:43:47 +0000
commit923889728b1fbc379cd598191c0548690824b146 (patch)
treed52c5e1abb1206d0500194fda328458a2ab7236c
parent7ce14e0f9d8541e16f3e4f88ea6d9b77c3bd19c7 (diff)
downloaddrakx-923889728b1fbc379cd598191c0548690824b146.tar
drakx-923889728b1fbc379cd598191c0548690824b146.tar.gz
drakx-923889728b1fbc379cd598191c0548690824b146.tar.bz2
drakx-923889728b1fbc379cd598191c0548690824b146.tar.xz
drakx-923889728b1fbc379cd598191c0548690824b146.zip
no_comment
-rw-r--r--perl-install/install_interactive.pm2
-rw-r--r--perl-install/modules.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index f5fe63069..26cfbd4f8 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -146,7 +146,7 @@ When sure, press Ok.")) or return;
if (!$readonly && ref($o) =~ /gtk/) { #- diskdrake only available in gtk for now
require diskdrake;
- $solutions{diskdrake} = [ 0, ($::beginner ? _("Expert mode"), _("Use diskdrake")), sub { partition_with_diskdrake($o, $hds, 'nowizard') } ];
+ $solutions{diskdrake} = [ 0, ($::beginner ? _("Expert mode") : _("Use diskdrake")), sub { partition_with_diskdrake($o, $hds, 'nowizard') } ];
}
$solutions{fdisk} =
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 5af4358dd..16058a0b1 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -373,7 +373,7 @@ sub remove_alias($) {
sub when_load {
my ($name, $type, @options) = @_;
- add_alias('scsi_hostadapter', $name), load('sd_mod') if $type =~ /scsi/ || $type eq $type_aliases{scsi};
+ add_alias('scsi_hostadapter', $name), eval { load('sd_mod') } if $type =~ /scsi/ || $type eq $type_aliases{scsi};
$conf{$name}{options} = join " ", @options if @options;
}