diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-17 10:57:00 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-17 11:20:06 +0200 |
| commit | ba2fa54ce467dfeda61f696bfd8b94aed4c99112 (patch) | |
| tree | 394ae86e94a1fc7b66b7b30cb214e9223a621ffe | |
| parent | 6349a8e06dfa20179788d98e6247c02782f7d230 (diff) | |
| download | drakx-ba2fa54ce467dfeda61f696bfd8b94aed4c99112.tar drakx-ba2fa54ce467dfeda61f696bfd8b94aed4c99112.tar.gz drakx-ba2fa54ce467dfeda61f696bfd8b94aed4c99112.tar.bz2 drakx-ba2fa54ce467dfeda61f696bfd8b94aed4c99112.tar.xz drakx-ba2fa54ce467dfeda61f696bfd8b94aed4c99112.zip | |
fix regression refusing FAT for ESP (mga#15962)
regression introduced in commit ae5b3ce9845669227ef06c90dfaa1065a7ceebe8
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/fs/type.pm | 5 | ||||
| -rw-r--r-- | perl-install/fsedit.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
4 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 78bcaa93f..cfb772fc9 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- library (for draklive-install): + o fix regression refusing FAT for ESP (mga#15962) + Version 16.95 - 14 May 2015 - library (for draklive-install): diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index 30bf01d78..70627be37 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -375,8 +375,11 @@ sub guessed_by_mount() { grep { $_ && !/nodev/ } chomp_(cat_('/etc/filesystems')); } +sub directories_needed_to_boot_not_ESP() { + qw(/ /usr /var /boot /tmp); +} sub directories_needed_to_boot() { - qw(/ /usr /var /boot /boot/EFI /tmp); + directories_needed_to_boot_not_ESP(), '/boot/EFI'; } sub carry_root_loopback { diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 4b56338ed..edb2392ad 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -489,7 +489,7 @@ 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") . $mntpoint - if !isTrueFS($part) && member($mntpoint, '/home', fs::type::directories_needed_to_boot()); + if !isTrueFS($part) && member($mntpoint, '/home', fs::type::directories_needed_to_boot_not_ESP()); 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 94cfda683..e7cb895a9 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- partitioning: + o fix regression refusing FAT for ESP (mga#15962) + Version 16.95 - 14 May 2015 - better dialog title (mga#9648) |