summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-28 19:49:53 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-28 19:49:53 +0000
commit900590657e31ed9da66718da7d7fdbe59408c226 (patch)
treecb2e4c53f7397027405fc36e9e9098d3c1021f1c
parent9df220c4b6b5ace71378306095454c1d97fcd3cf (diff)
downloaddrakx-900590657e31ed9da66718da7d7fdbe59408c226.tar
drakx-900590657e31ed9da66718da7d7fdbe59408c226.tar.gz
drakx-900590657e31ed9da66718da7d7fdbe59408c226.tar.bz2
drakx-900590657e31ed9da66718da7d7fdbe59408c226.tar.xz
drakx-900590657e31ed9da66718da7d7fdbe59408c226.zip
(install,check_mntpoint) forbid having /boot as btrfs (mga#5627)
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/fsedit.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index c7546a125..757b3022e 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 55efecddd..48da034c7 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/install/NEWS b/perl-install/install/NEWS
index c93319439..29c730cbf 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,6 @@
- add btrfsck
+- partitioning:
+ o forbid having /boot as btrfs (mga#5627)
Version 14.15 - 27 april 2012