diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2010-04-30 08:49:00 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2010-04-30 08:49:00 +0000 |
| commit | 5a477d971beb009195ed4cb45233ebb0e8a82440 (patch) | |
| tree | d199e1fcf7a757e6775370729b55dc86306f7785 | |
| parent | c45f100c7f4951655a30f619a41c3d76f014cde0 (diff) | |
| download | drakx-5a477d971beb009195ed4cb45233ebb0e8a82440.tar drakx-5a477d971beb009195ed4cb45233ebb0e8a82440.tar.gz drakx-5a477d971beb009195ed4cb45233ebb0e8a82440.tar.bz2 drakx-5a477d971beb009195ed4cb45233ebb0e8a82440.tar.xz drakx-5a477d971beb009195ed4cb45233ebb0e8a82440.zip | |
fix the crypto mountpoint checks for the create case
when creating current partition is of type isRawLUKS, not yet LUKS
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/fsedit.pm | 4 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 2f8f28a65..241576eff 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o fix the crypto mountpoint checks for the create case + Version 13.22 - 29 April 2010 - diskdrake: diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 8c8561b2a..6b71d372d 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -433,13 +433,13 @@ No bootloader is able to handle this without a /boot partition. Please be sure to add a /boot partition") if $md_part->{level} ne '1'; # lilo handles / on RAID1 } - if ($mntpoint eq "/" && isLUKS($part) && !fs::get::has_mntpoint("/boot", $all_hds)) { + 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. Please be sure to add a /boot partition"); } - if ($mntpoint eq "/boot" && isLUKS($part)) { + if ($mntpoint eq "/boot" && (isLUKS($part) || isRawLUKS($part))) { die N("You can not use an encrypted file system for mount point %s", "/boot"); } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index aeb6102a6..a9d32f32c 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o fix the crypto mountpoint checks for the create case + Version 13.22 - 29 April 2010 - diskdrake: |