cryptsetup: show udev device name when asking for password

diff --git a/Makefile.am b/Makefile.am
index dd475acf70f8ffbda8d43c239e837d01fb10707e..e1f6fe058e7a10ef42bab874eb76916d4ea38211 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -773,10 +773,12 @@ systemd_cryptsetup_SOURCES = \
 
 systemd_cryptsetup_CFLAGS = \
        $(LIBCRYPTSETUP_CFLAGS) \
+       $(UDEV_CFLAGS) \
        $(AM_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
        $(LIBCRYPTSETUP_LIBS) \
+       $(UDEV_LIBS) \
        libsystemd-basic.la
 
 systemd_cryptsetup_generator_SOURCES = \

diff --git a/TODO b/TODO
index 73d6c36a3afec0da55dacb6f0dd80645ffa3594f..3101db2fe8165158f5ef53c96afca31117d8ca6c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -57,8 +57,6 @@
 
 * when processes remain in a service even though the start command failed enter active
 
-* parse early boot time env var from dracut RD_TIMEOUT, drop RD_xxx
-
 * add seperate man page for [Install] settings
 
 * only add quotacheck deps to .mount units which mention grpquota/usrquota in the mount flags
@@ -75,8 +73,6 @@
 
 * isolate multi-user.target doesn't start a getty@tty1 if we run it from graphical.target
 
-* read description string from device in crypttsetup
-
 External:
 
 * make cryptsetup lower --iter-time
@@ -89,8 +85,6 @@ External:
 
 * pam_securetty should honour console=
 
-* sysctl should support sysctl.conf.d directory
-
 * procps, psmisc, sysvinit-tools, hostname → util-linux-ng
 
 https://bugzilla.redhat.com/show_bug.cgi?id=614245 -- plymouth

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index ee15802365c7161f25b00dea94868bd541916d35..48b2c9ce1b0a1c7852e4304d14ba83346b73952b 100644 (file)
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -24,6 +24,7 @@
 #include <sys/mman.h>
 
 #include <libcryptsetup.h>
+#include <libudev.h>
 
 #include "log.h"
 #include "util.h"
@@ -140,11 +141,47 @@ static void log_glue(int level, const char *msg, void *usrptr) {
         log_debug("%s", msg);
 }
 
+static char *disk_description(const char *path) {
+        struct udev *udev = NULL;
+        struct udev_device *device = NULL;
+        struct stat st;
+        char *description = NULL;
+        const char *model;
+
+        assert(path);
+
+        if (stat(path, &st) < 0)
+                return NULL;
+
+        if (!S_ISBLK(st.st_mode))
+                return NULL;
+
+        if (!(udev = udev_new()))
+                return NULL;
+
+        if (!(device = udev_device_new_from_devnum(udev, 'b', st.st_rdev)))
+                goto finish;
+
+        if ((model = udev_device_get_property_value(device, "ID_MODEL_FROM_DATABASE")) ||
+            (model = udev_device_get_property_value(device, "ID_MODEL")))
+                description = strdup(model);
+
+finish:
+        if (device)
+                udev_device_unref(device);
+
+        if (udev)
+                udev_unref(udev);
+
+        return description;
+}
+
 int main(int argc, char *argv[]) {
         int r = EXIT_FAILURE;
         struct crypt_device *cd = NULL;
         char *password = NULL, *truncated_cipher = NULL;
-        const char *cipher = NULL, *cipher_mode = NULL, *hash = NULL;
+        const char *cipher = NULL, *cipher_mode = NULL, *hash = NULL, *name = NULL;
+        char *description = NULL;
 
         if (argc < 3) {
                 log_error("This program requires at least two arguments.");
@@ -185,6 +222,9 @@ int main(int argc, char *argv[]) {
                 /* A delicious drop of snake oil */
                 mlockall(MCL_FUTURE);
 
+                description = disk_description(argv[3]);
+                name = description ? description : argv[2];
+
                 if ((k = crypt_init(&cd, argv[3]))) {
                         log_error("crypt_init() failed: %s", strerror(-k));
                         goto finish;
@@ -382,5 +422,7 @@ finish:
 
         free(password);
 
+        free(description);
+
         return r;
 }