summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-10-03 09:25:44 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-10-03 09:25:44 +0000
commitfa563a3fa13b8b234ad1e6f9bd02727fd39c02c2 (patch)
treef574b624a8f32cfc9fb058aeb650677c6f2cc6f5
parentadf9d3e0e187e01b80209c71d273443376f503e3 (diff)
downloaddrakx-fa563a3fa13b8b234ad1e6f9bd02727fd39c02c2.tar
drakx-fa563a3fa13b8b234ad1e6f9bd02727fd39c02c2.tar.gz
drakx-fa563a3fa13b8b234ad1e6f9bd02727fd39c02c2.tar.bz2
drakx-fa563a3fa13b8b234ad1e6f9bd02727fd39c02c2.tar.xz
drakx-fa563a3fa13b8b234ad1e6f9bd02727fd39c02c2.zip
simplify
-rw-r--r--perl-install/bootloader.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 4cfad778f..5e311e348 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1057,9 +1057,9 @@ sub method_choices {
my $have_dmraid = find { fs::type::is_dmraid($_) } @{$all_hds->{hds}};
grep {
- (!/lilo/ || !isLoopback($root_part) && !$have_dmraid)
- && (!/grub/ || !isRAID($root_part))
- && (!/grub-graphic/ || cat_("/proc/cmdline") !~ /console=ttyS/);
+ !(/lilo/ && (isLoopback($root_part) || $have_dmraid))
+ && !(/grub/ && isRAID($root_part))
+ && !(/grub-graphic/ && cat_("/proc/cmdline") =~ /console=ttyS/);
} method_choices_raw($b_prefix_mounted);
}
sub main_method_choices {