Attachment 2160 Details for Bug 5695 – real fix

[patch] real fix

5627.diff (text/plain), 1.47 KB, created by Thierry Vignaud on 2012-05-02 21:26:33 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2012-05-02 21:26:33 CEST

Size: 1.47 KB

patch

obsolete

>diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
>index c7546a1..757b302 100644
>--- a/perl-install/bootloader.pm
>+++ b/perl-install/bootloader.pm
>@@ -1968,7 +1968,7 @@ sub install {
> 
>     if (my $part = fs::get::device2part($bootloader->{boot}, [ fs::get::fstab($all_hds) ])) {
> 	die N("You cannot install the bootloader on a %s partition\n", $part->{fs_type})
>-	  if $part->{fs_type} eq 'xfs';
>+	  if member($part->{fs_type}, qw(btrfs xfs));
>     }
>     $bootloader->{keytable} = keytable($bootloader->{keytable});
>     action($bootloader, 'install', $all_hds);
>diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
>index 55efecd..6864d66 100644
>--- a/perl-install/fsedit.pm
>+++ b/perl-install/fsedit.pm
>@@ -479,6 +479,8 @@ You should create a separate /boot partition first") if $mntpoint eq "/" && isLV
>     die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
>       if !isTrueLocalFS($part) && $mntpoint eq '/';
>     die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
>+      if $part{fs_type} eq 'btrfs' && $mntpoint eq '/boot';
>+    die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
>       if !isTrueFS($part) && member($mntpoint, '/home', fs::type::directories_needed_to_boot());
>     die N("You cannot use an encrypted filesystem for mount point %s", $mntpoint)
>       if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var /boot));

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index c7546a1..757b302 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1968,7 +1968,7 @@ sub install {
 
     if (my $part = fs::get::device2part($bootloader->{boot}, [ fs::get::fstab($all_hds) ])) {
 	die N("You cannot install the bootloader on a %s partition\n", $part->{fs_type})
-	  if $part->{fs_type} eq 'xfs';
+	  if member($part->{fs_type}, qw(btrfs xfs));
     }
     $bootloader->{keytable} = keytable($bootloader->{keytable});
     action($bootloader, 'install', $all_hds);
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 55efecd..6864d66 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -479,6 +479,8 @@ You should create a separate /boot partition first") if $mntpoint eq "/" && isLV
     die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
       if !isTrueLocalFS($part) && $mntpoint eq '/';
     die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
+      if $part{fs_type} eq 'btrfs' && $mntpoint eq '/boot';
+    die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
       if !isTrueFS($part) && member($mntpoint, '/home', fs::type::directories_needed_to_boot());
     die N("You cannot use an encrypted filesystem for mount point %s", $mntpoint)
       if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var /boot));

Actions: View | Diff

Attachments on bug 5695: 2158 | 2160 | 2167 | 2186