From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 5 Dec 2017 05:03:11 +0000 (+0900)
Subject: bootspec: use blkid only if HAVE_BLKID is defined
X-Git-Tag: v236~68^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e066f7feda001f98884ee2a29647e44f3d45c4e;p=thirdparty%2Fsystemd.git

bootspec: use blkid only if HAVE_BLKID is defined
---

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index aa722c304a0..0481293a50c 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -419,12 +419,14 @@ static int verify_esp(
                 uint64_t *ret_pstart,
                 uint64_t *ret_psize,
                 sd_id128_t *ret_uuid) {
-
+#if HAVE_BLKID
         _cleanup_blkid_free_probe_ blkid_probe b = NULL;
         char t[DEV_NUM_PATH_MAX];
+        const char *v;
+#endif
         uint64_t pstart = 0, psize = 0;
         struct stat st, st2;
-        const char *v, *t2;
+        const char *t2;
         struct statfs sfs;
         sd_id128_t uuid = SD_ID128_NULL;
         uint32_t part = 0;
@@ -479,6 +481,7 @@ static int verify_esp(
         if (detect_container() > 0 || geteuid() != 0)
                 goto finish;
 
+#if HAVE_BLKID
         xsprintf_dev_num_path(t, "block", st.st_dev);
         errno = 0;
         b = blkid_new_probe_from_filename(t);
@@ -561,6 +564,7 @@ static int verify_esp(
         r = safe_atou64(v, &psize);
         if (r < 0)
                 return log_error_errno(r, "Failed to parse PART_ENTRY_SIZE field.");
+#endif
 
 finish:
         if (ret_part)