summaryrefslogtreecommitdiffstats
path: root/perl-install/fs/partitioning_wizard.pm
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-04-27 16:11:14 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-04-27 16:11:14 +0000
commitaadc2218aee4cea8b81ec3802a8879502a96c5f1 (patch)
treef0cc82c56c27f7387b7599717c5efbb23f623442 /perl-install/fs/partitioning_wizard.pm
parent5bf28da317c04c6691bbe6d7c666d9b40e6e05a3 (diff)
downloaddrakx-aadc2218aee4cea8b81ec3802a8879502a96c5f1.tar
drakx-aadc2218aee4cea8b81ec3802a8879502a96c5f1.tar.gz
drakx-aadc2218aee4cea8b81ec3802a8879502a96c5f1.tar.bz2
drakx-aadc2218aee4cea8b81ec3802a8879502a96c5f1.tar.xz
drakx-aadc2218aee4cea8b81ec3802a8879502a96c5f1.zip
fix installation of plymouth
Diffstat (limited to 'perl-install/fs/partitioning_wizard.pm')
-rw-r--r--perl-install/fs/partitioning_wizard.pm7
1 files changed, 1 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?"));
}