summaryrefslogtreecommitdiffstats
path: root/src/udev/udev-builtin-blkid.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-09-15 17:48:16 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-09-20 16:48:50 +0200
commit92e720281250aab9cd2728964c9d38d93b5b2013 (patch)
treebf52bef9440a6cc83d1c75d7be9a7818d9ce0305 /src/udev/udev-builtin-blkid.c
parentman: "the initial RAM disk" → "the initrd" (diff)
downloadsystemd-92e720281250aab9cd2728964c9d38d93b5b2013.tar.xz
systemd-92e720281250aab9cd2728964c9d38d93b5b2013.zip
headers: export partition uuids and flags in new sd-gpt.h file
I think those constants are generally useful. It's quite easy to make a mistake when copying things from the docs, so let's make them easy and convenient to access.
Diffstat (limited to 'src/udev/udev-builtin-blkid.c')
-rw-r--r--src/udev/udev-builtin-blkid.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index f992c8f4c5..435cac44ed 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -117,7 +117,7 @@ static void print_property(sd_device *dev, bool test, const char *name, const ch
static int find_gpt_root(sd_device *dev, blkid_probe pr, bool test) {
-#if defined(GPT_ROOT_NATIVE) && ENABLE_EFI
+#if defined(SD_GPT_ROOT_NATIVE) && ENABLE_EFI
_cleanup_free_ char *root_id = NULL, *root_label = NULL;
bool found_esp = false;
@@ -157,7 +157,7 @@ static int find_gpt_root(sd_device *dev, blkid_probe pr, bool test) {
if (sd_id128_from_string(stype, &type) < 0)
continue;
- if (sd_id128_equal(type, GPT_ESP)) {
+ if (sd_id128_equal(type, SD_GPT_ESP)) {
sd_id128_t id, esp;
/* We found an ESP, let's see if it matches
@@ -173,11 +173,11 @@ static int find_gpt_root(sd_device *dev, blkid_probe pr, bool test) {
if (sd_id128_equal(id, esp))
found_esp = true;
- } else if (sd_id128_equal(type, GPT_ROOT_NATIVE)) {
+ } else if (sd_id128_equal(type, SD_GPT_ROOT_NATIVE)) {
unsigned long long flags;
flags = blkid_partition_get_flags(pp);
- if (flags & GPT_FLAG_NO_AUTO)
+ if (flags & SD_GPT_FLAG_NO_AUTO)
continue;
/* We found a suitable root partition, let's remember the first one, or the one with