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

[Lennart Poettering]

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

New commits:
commit 8e486ef03b992d4c0d373195f5e8d1c3a200bc30
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Nov 18 23:56:34 2010 +0100

    build-sys: bump for v13

diff --git a/configure.ac b/configure.ac
index d29e2d8..247806d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([systemd],[12],[systemd-devel at lists.freedesktop.org])
+AC_INIT([systemd],[13],[systemd-devel at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])

commit 1cd4a9f0e94f80a3b2e9f74aeb201273cbe63026
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Nov 18 23:40:27 2010 +0100

    cryptsetup: actually show disk name

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 48b2c9c..f543a05 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -274,7 +274,7 @@ int main(int argc, char *argv[]) {
                         if (!key_file) {
                                 char *text;
 
-                                if (asprintf(&text, "Please enter passphrase for disk %s!", argv[2]) < 0) {
+                                if (asprintf(&text, "Please enter passphrase for disk %s!", name) < 0) {
                                         log_error("Out of memory");
                                         goto finish;
                                 }
@@ -290,7 +290,7 @@ int main(int argc, char *argv[]) {
                                 if (opt_verify) {
                                         char *password2 = NULL;
 
-                                        if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", argv[2]) < 0) {
+                                        if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", name) < 0) {
                                                 log_error("Out of memory");
                                                 goto finish;
                                         }