diff options
| author | Lennart Poettering <lennart@poettering.net> | 2022-09-21 20:07:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-21 20:07:21 +0200 |
| commit | 4d0d34b4e7054f7bef105ed1ec27f976778c5c4e (patch) | |
| tree | 52522848de7a5f518af573c4014c2419ea127cbc /src/home | |
| parent | df4bed3f923bbe5be8e84131aa035dbab2ddf49c (diff) | |
| parent | ed1cf1d9707fa4c11fe0106a72fb25364e02f625 (diff) | |
| download | systemd-4d0d34b4e7054f7bef105ed1ec27f976778c5c4e.tar.gz | |
Merge pull request #24709 from keszybz/partition-table-constants
Expose various GPT UUIDs as public contants and link them up in docs
Diffstat (limited to 'src/home')
| -rw-r--r-- | src/home/homed-manager.c | 2 | ||||
| -rw-r--r-- | src/home/homework-luks.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/home/homed-manager.c b/src/home/homed-manager.c index 38945d7988..61ef979049 100644 --- a/src/home/homed-manager.c +++ b/src/home/homed-manager.c @@ -1239,7 +1239,7 @@ static int manager_add_device(Manager *m, sd_device *d) { return 0; if (r < 0) return log_error_errno(r, "Failed to acquire ID_PART_ENTRY_TYPE device property, ignoring: %m"); - if (sd_id128_string_equal(parttype, GPT_USER_HOME) <= 0) { + if (sd_id128_string_equal(parttype, SD_GPT_USER_HOME) <= 0) { log_debug("Found partition (%s) we don't care about, ignoring.", sysfs); return 0; } diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index c57621a6b1..0369e285a7 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -704,7 +704,7 @@ static int luks_validate( if (!pp) return errno > 0 ? -errno : -EIO; - if (sd_id128_string_equal(blkid_partition_get_type_string(pp), GPT_USER_HOME) <= 0) + if (sd_id128_string_equal(blkid_partition_get_type_string(pp), SD_GPT_USER_HOME) <= 0) continue; if (!streq_ptr(blkid_partition_get_name(pp), label)) @@ -1851,7 +1851,7 @@ static int make_partition_table( if (!t) return log_oom(); - r = fdisk_parttype_set_typestr(t, GPT_USER_HOME_STR); + r = fdisk_parttype_set_typestr(t, SD_GPT_USER_HOME_STR); if (r < 0) return log_error_errno(r, "Failed to initialize partition type: %m"); |