Compare commits

..

3 Commits

Author SHA1 Message Date
Anita Zhang e71f5585b9 meson: add min version for libfdisk
Was trying to run src/partition/test-repart.sh on CentOS 8 and the first
resize call kept failing with ERANGE. Turned out that CentOS 8 comes
with libfdisk-devel-2.32.1 which is missing
2f35c1ead6
(in libfdisk 2.33 and up).
2020-08-19 10:18:33 +02:00
Anita Zhang 9c23ce7363
Merge pull request #16780 from alyssais/grammar
load-fragment: fix grammar in error messages
2020-08-18 22:41:34 -07:00
Alyssa Ross 556a7bbed6
load-fragment: fix grammar in error messages 2020-08-18 20:56:59 +00:00
3 changed files with 4 additions and 2 deletions

1
README
View File

@ -151,6 +151,7 @@ REQUIREMENTS:
libcryptsetup (optional), >= 2.3.0 required for signed Verity images support libcryptsetup (optional), >= 2.3.0 required for signed Verity images support
libaudit (optional) libaudit (optional)
libacl (optional) libacl (optional)
libfdisk >= 2.33 (from util-linux) (optional)
libselinux (optional) libselinux (optional)
liblzma (optional) liblzma (optional)
liblz4 >= 1.3.0 / 130 (optional) liblz4 >= 1.3.0 / 130 (optional)

View File

@ -890,6 +890,7 @@ libmount = dependency('mount',
want_libfdisk = get_option('fdisk') want_libfdisk = get_option('fdisk')
if want_libfdisk != 'false' and not skip_deps if want_libfdisk != 'false' and not skip_deps
libfdisk = dependency('fdisk', libfdisk = dependency('fdisk',
version : '>= 2.33',
required : want_libfdisk == 'true') required : want_libfdisk == 'true')
have = libfdisk.found() have = libfdisk.found()
else else

View File

@ -4595,7 +4595,7 @@ int config_parse_bind_paths(
r = unit_full_printf(u, source, &sresolved); r = unit_full_printf(u, source, &sresolved);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, log_syntax(unit, LOG_ERR, filename, line, r,
"Failed to resolved unit specifiers in \"%s\", ignoring: %m", source); "Failed to resolve unit specifiers in \"%s\", ignoring: %m", source);
continue; continue;
} }
@ -4626,7 +4626,7 @@ int config_parse_bind_paths(
r = unit_full_printf(u, destination, &dresolved); r = unit_full_printf(u, destination, &dresolved);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, log_syntax(unit, LOG_ERR, filename, line, r,
"Failed to resolved specifiers in \"%s\", ignoring: %m", destination); "Failed to resolve specifiers in \"%s\", ignoring: %m", destination);
continue; continue;
} }