summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/fs/partitioning_wizard.pm7
-rw-r--r--perl-install/install/steps.pm6
2 files changed, 7 insertions, 6 deletions
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index c66312728..edd783850 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, $root;
+ my $ok;
do {
$ok = 1;
@@ -55,11 +55,6 @@ 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?"));
}
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 5ee5a5640..76decbf37 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -404,6 +404,12 @@ sub installCallback {
sub installPackages {
my ($o, $o_interactive) = @_;
+
+ my $p = fs::get::root_($o->{fstab});
+ if ($p->{dmcrypt_name}) {
+ install::pkgs::selectPackage($o->{packages}, install::pkgs::packageByName($o->{packages}, 'plymouth'));
+ }
+
my $packages = $o->{packages};
install::pkgs::remove_marked_ask_remove($packages, \&installCallback);