[systemd-commits] 2 commits - configure.ac src/cryptsetup.c

[Lennart Poettering]

 configure.ac     |    2 +-
 src/cryptsetup.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dffbaed9647c613386fc9c3b84d2884697801142
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Apr 21 03:18:39 2011 +0200

    build-sys: bump release

diff --git a/configure.ac b/configure.ac
index 7837918..730861f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([systemd],[24],[systemd-devel at lists.freedesktop.org])
+AC_INIT([systemd],[25],[systemd-devel at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])

commit 1c1890bee6b357ea963f2340fd2b2c25e70dc30d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Apr 21 03:15:12 2011 +0200

    Revert "cryptsetup: pass 0 as key size to crypt_activate_by_keyfile()"
    
    This reverts commit 9402841ef197e485061ab328edcaa0e6d83051bd.
    
    This freezes boot-up when /dev/urandom is used as key source

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index d7c458a..4ef9606 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -447,7 +447,7 @@ int main(int argc, char *argv[]) {
                                  argv[3]);
 
                         if (key_file)
-                                k = crypt_activate_by_keyfile(cd, argv[2], CRYPT_ANY_SLOT, key_file, 0, flags);
+                                k = crypt_activate_by_keyfile(cd, argv[2], CRYPT_ANY_SLOT, key_file, opt_key_size, flags);
                         else {
                                 char **p;