summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-02-11 17:30:26 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-02-11 17:30:26 +0000
commitd0d89fbf3007ee1a019da895af1d5bb32676bca1 (patch)
tree68fda92e9ff4d92e2b9fc9933cb04b512c013254
parente9843d14bcb24f60fbfbaf84e8e35b9fd041c6a8 (diff)
downloaddrakx-d0d89fbf3007ee1a019da895af1d5bb32676bca1.tar
drakx-d0d89fbf3007ee1a019da895af1d5bb32676bca1.tar.gz
drakx-d0d89fbf3007ee1a019da895af1d5bb32676bca1.tar.bz2
drakx-d0d89fbf3007ee1a019da895af1d5bb32676bca1.tar.xz
drakx-d0d89fbf3007ee1a019da895af1d5bb32676bca1.zip
load cbc module for encrypted loop
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/devices.pm2
-rw-r--r--perl-install/install/NEWS1
3 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ff9ec1a31..6411d89d9 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -9,6 +9,7 @@
put it into first non removable drive (#47106)
- do_pkgs:
o add ensure_files_are_installed
+- load cbc for encrypted loop
Version 11.81 - 3 February 2009
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 40c420306..09606f7ca 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -28,7 +28,7 @@ sub set_loop {
my $dev = find_free_loop();
if ($o_encrypt_key && $o_encryption) {
- eval { modules::load('cryptoloop', arch() =~ /i.86/ ? 'aes-i586' : 'aes') };
+ eval { modules::load('cryptoloop', 'cbc', arch() =~ /i.86/ ? 'aes-i586' : 'aes') };
my $cmd = "losetup -p 0 -e $o_encryption $dev $file";
log::l("calling $cmd");
open(my $F, "|$cmd");
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a26257ae2..6168f8d9a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- when installing to a removable device, put boot sector there, else
put it into first non removable drive (#47106)
- fix preserving UUID when formatting ext* and swap, and handle more FS (#39913)
+- load cbc module for encrypted loop
Version 11.83 - 6 February 2009