From 4215d770341c72ec139ed5d5332d7406c08cde16 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 22 Jan 2002 22:08:51 +0000 Subject: - 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 --- perl-install/any.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install/any.pm') 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}; -- cgit v1.2.1