Compare commits

..

No commits in common. "e71f5585b9b0580428f9530d0a485265c9c25165" and "07b4f4496868578e56932a292de0f0b1881ecc84" have entirely different histories.

3 changed files with 2 additions and 4 deletions

1
README
View File

@ -151,7 +151,6 @@ 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,7 +890,6 @@ 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 resolve unit specifiers in \"%s\", ignoring: %m", source); "Failed to resolved 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 resolve specifiers in \"%s\", ignoring: %m", destination); "Failed to resolved specifiers in \"%s\", ignoring: %m", destination);
continue; continue;
} }