summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-01-22 22:08:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-01-22 22:08:51 +0000
commit4215d770341c72ec139ed5d5332d7406c08cde16 (patch)
tree4b0ef0f2e93bb54621ce838d96e21e9dcb41cb64 /perl-install/any.pm
parent06cb710b40d30e74adc8a88e4ba335f8ddbd7d39 (diff)
downloaddrakx-4215d770341c72ec139ed5d5332d7406c08cde16.tar
drakx-4215d770341c72ec139ed5d5332d7406c08cde16.tar.gz
drakx-4215d770341c72ec139ed5d5332d7406c08cde16.tar.bz2
drakx-4215d770341c72ec139ed5d5332d7406c08cde16.tar.xz
drakx-4215d770341c72ec139ed5d5332d7406c08cde16.zip
- fix default not being formatted like labels for lilo
- check the label is not already used *case-sensitively* - check a kernel_or_dev is given
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 3576c6ce8..f3ad81c22 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -307,7 +307,8 @@ if (arch() !~ /ppc/) {
callbacks => {
complete => sub {
$e->{label} or $in->ask_warn('', _("Empty label not allowed")), return 1;
- member($e->{label}, map { $_->{label} } grep { $_ != $e } @{$b->{entries}}) and $in->ask_warn('', _("This label is already used")), return 1;
+ $e->{kernel_or_dev} or $in->ask_warn('', $e->{type} eq 'image' ? _("You must specify a kernel image") : _("You must specify a root partition")), return 1;
+ member(lc $e->{label}, map { lc $_->{label} } grep { $_ != $e } @{$b->{entries}}) and $in->ask_warn('', _("This label is already used")), return 1;
0;
} } }, \@l)) {
$b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default};