]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
cryptsetup: also check for /dev/hwrng as random device node
authorLennart Poettering <lennart@poettering.net>
Wed, 29 Apr 2020 16:23:02 +0000 (18:23 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 19 May 2020 15:28:33 +0000 (17:28 +0200)
src/cryptsetup/cryptsetup-generator.c

index 5724f88d0a4cd1f218bead9ac300f875e38b483c..7974c19a4466b7c68236d29d82a34318d92e92a2 100644 (file)
@@ -188,7 +188,11 @@ static int print_dependencies(FILE *f, const char* device_path) {
                 /* None, nothing to do */
                 return 0;
 
-        if (PATH_IN_SET(device_path, "/dev/urandom", "/dev/random", "/dev/hw_random")) {
+        if (PATH_IN_SET(device_path,
+                        "/dev/urandom",
+                        "/dev/random",
+                        "/dev/hw_random",
+                        "/dev/hwrng")) {
                 /* RNG device, add random dep */
                 fputs("After=systemd-random-seed.service\n", f);
                 return 0;
@@ -209,7 +213,9 @@ static int print_dependencies(FILE *f, const char* device_path) {
                 if (r < 0)
                         return log_error_errno(r, "Failed to generate unit name: %m");
 
-                fprintf(f, "After=%1$s\nRequires=%1$s\n", unit);
+                fprintf(f,
+                        "After=%1$s\n"
+                        "Requires=%1$s\n", unit);
         } else {
                 /* Regular file, add mount dependency */
                 _cleanup_free_ char *escaped_path = specifier_escape(device_path);