From: ettavolt <ettavolt@gmail.com>
Date: Mon, 4 Sep 2017 13:36:52 +0000 (+0300)
Subject: 6647 - use path_startswith("/dev") in cryptsetup (#6732)
X-Git-Tag: v235~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=048dd629c4590eefb2ebd6a316c7350ed3a6ff19;p=thirdparty%2Fsystemd.git

6647 - use path_startswith("/dev") in cryptsetup (#6732)

For both key and partition paths.
---

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 9ecb6e3566a..613b018ce6e 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -129,7 +129,7 @@ static int create_disk(
 
                         if (!path_equal(uu, "/dev/null")) {
 
-                                if (is_device_path(uu)) {
+                                if (path_startswith(uu, "/dev/")) {
                                         _cleanup_free_ char *dd = NULL;
 
                                         r = unit_name_from_path(uu, ".device", &dd);
@@ -143,7 +143,7 @@ static int create_disk(
                 }
         }
 
-        if (is_device_path(u)) {
+        if (path_startswith(u, "/dev/")) {
                 fprintf(f,
                         "BindsTo=%s\n"
                         "After=%s\n"