system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 20:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31711 from YHNdnzj/gpt-auto-has-node

Browse source 
gpt-auto: ignore fstab_has_node failure
This commit is contained in:
Luca Boccassi 2024-03-11 12:40:22 +00:00 committed by GitHub
parent 29556b75d8 622f2dcc71
commit c7edd9f13d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gpt-auto-generator/gpt-auto-generator.c
View file

@ -533,8 +533,8 @@ static int add_partition_esp(DissectedPartition *p, bool has_xbootldr) {
/* Check if there's an existing fstab entry for ESP. If so, we just skip the gpt-auto logic. */
r = fstab_has_node(p->node);
if (r < 0)
return log_error_errno(r,
"Failed to check if fstab entry for device '%s' exists: %m", p->node);
log_warning_errno(r, "Failed to check if fstab entry for device '%s' exists, ignoring: %m",
p->node);
if (r > 0)
return 0;

2
src/shared/fstab-util.c
View file

@ -164,8 +164,6 @@ int fstab_is_mount_point_full(const char *where, const char *path) {
if (r > 0 || (r < 0 && !ERRNO_IS_DEVICE_ABSENT(r)))
return r;
}
return false;
}
int fstab_filter_options(