From 5976acd282a1564ea4d3fd8b1c08bce240493194 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 4 Jul 2016 17:42:41 +0200
Subject: do not warn about no bootloader can boot RAID[^1]

As grub2 can boot... (mga#11324)
This should also fix mga#9524
And thus stop forcing obsolete metadata 0.90 format
---
 perl-install/NEWS         |  1 +
 perl-install/fsedit.pm    | 27 ---------------------------
 perl-install/install/NEWS |  1 +
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index fae023f06..69f94b357 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - diskdrake:
   o do not offer to check for bad blocks on btrfs (mga#12393)
+  o do not warn about no bootloader can boot RAID[^1] as grub2 can (mga#11324)
   o enable bad blocks checking on JFS
 - drakboot:
   o allow installing grub2 on XFS /
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 8508391d5..9aa596527 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -451,33 +451,6 @@ sub check_mntpoint {
     $mntpoint =~ m|[\x7f-\xff]| and cdie N("Mount points should contain only alphanumerical characters");
     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)) {
-	# 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 separate /boot partition");
-	} else {
-	    # 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 separate /boot partition.");
-	    } else {
-		$part->{metadata} = '0.90';
-	    }
-	}
-    }
-
-    if ($mntpoint eq "/boot" && isRAID($part))  {
-	die N("You've selected a software RAID partition as /boot.
-No bootloader is able to handle this.") if $part->{level} ne '1'; # lilo handles /boot on RAID1
-	# LILO only handles 0.90 metadata
-	if ($part->{isFormatted} && $part->{metadata} && $part->{metadata} ne '0.90') {
-	    die N("Metadata version unsupported for a boot partition.");
-	} else {
-	    $part->{metadata} = '0.90';
-	}
-    }
-
     if ($mntpoint eq "/" && (isLUKS($part) || isRawLUKS($part)) && !fs::get::has_mntpoint("/boot", $all_hds)) {
 	cdie N("You've selected an encrypted partition as root (/).
 No bootloader is able to handle this without a /boot partition.
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index fa9088ed2..552903ce3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -4,6 +4,7 @@
   o make sure we only offer lilo/grub choice on upgrades only
 - partionning:
   o do not offer to check for bad blocks on btrfs (mga#12393)
+  o do not warn about no bootloader can boot RAID[^1] as grub2 can (mga#11324)
   o enable bad blocks checking on JFS
 - summary:
   o add help link for sound (mga#11824)
-- 
cgit v1.2.1