From 922461a2f87b06748701f8eac0a693ab623546fa Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Mon, 24 May 2010 15:36:50 +0000 Subject: cdie is not fatal --- perl-install/fsedit.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'perl-install/fsedit.pm') diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 787d105b8..680b7b8fb 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -427,14 +427,18 @@ sub check_mntpoint { fs::get::mntpoint2part($mntpoint, [ grep { $_ ne $part } fs::get::really_all_fstab($all_hds) ]) and die N("There is already a partition with mount point %s\n", $mntpoint); if ($mntpoint eq "/" && isRAID($part) && !fs::get::has_mntpoint("/boot", $all_hds)) { - cdie N("You've selected a software RAID partition as root (/). + # lilo handles / on RAID1 + if ($part->{level} ne '1') { + cdie N("You've selected a software RAID partition as root (/). No bootloader is able to handle this without a /boot partition. -Please be sure to add a /boot partition") if $part->{level} ne '1'; # lilo handles / on RAID1 - # LILO only handles 0.90 metadata - if ($part->{isFormatted} && $part->{metadata} && $part->{metadata} ne '0.90') { - cdie N("Metadata version unsupported for a boot partition. Please be sure to add a /boot partition."); +Please be sure to add a /boot partition"); } else { - $part->{metadata} = '0.90'; + # LILO only handles 0.90 metadata + if ($part->{isFormatted} && $part->{metadata} && $part->{metadata} ne '0.90') { + cdie N("Metadata version unsupported for a boot partition. Please be sure to add a /boot partition."); + } else { + $part->{metadata} = '0.90'; + } } } -- cgit v1.2.1