diff options
Diffstat (limited to 'perl-install/fs')
| -rw-r--r-- | perl-install/fs/partitioning_wizard.pm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index ea9521768..c66312728 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -31,7 +31,7 @@ sub to_Mb { sub partition_with_diskdrake { my ($in, $all_hds, $fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab) = @_; - my $ok; + my $ok, $root; do { $ok = 1; @@ -48,12 +48,18 @@ sub partition_with_diskdrake { } my @fstab = fs::get::fstab($all_hds); - unless (fs::get::root_(\@fstab)) { + unless ($root = fs::get::root_(\@fstab)) { $ok = 0; $in->ask_okcancel(N("Partitioning"), N("You must have a root partition. For this, create a partition (or click on an existing one). Then choose action ``Mount point'' and set it to `/'"), 1) or return; } + + # If / is encrypted, we need plymouth to ask for the password + if ($root && $root->{dmcrypt_name}) { + $in->do_pkgs->ensure_binary_is_installed('plymouth', undef, 1); + } + if (!any { isSwap($_) } @fstab) { $ok &&= $in->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?")); } |