diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-04-05 20:14:53 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-04-06 10:26:47 +0200 |
| commit | 006a60e079fb49d7cdebec3d566a83c6a370e3d4 (patch) | |
| tree | 407ce8febbd033f45dfd056fe67f1bea71b1781f /src/fstab-generator | |
| parent | dc2b3f94690bc02c2c1b6bdeca0d362f3639d7f0 (diff) | |
| download | systemd-006a60e079fb49d7cdebec3d566a83c6a370e3d4.tar.gz | |
fstab-generator: don't propagate ignored errno
With certain fstabs we may propagate ENXIO from the $SYSTEMD_SYSFS_CHECK
check all the way up, making fstab-generator exit with a non-zero EC and
without any helpful message, which is really confusing.
Diffstat (limited to 'src/fstab-generator')
| -rw-r--r-- | src/fstab-generator/fstab-generator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 69effacaa2..cc2c5512dd 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -698,10 +698,10 @@ static int parse_fstab(bool initrd) { } if (sysfs_check < 0) { - r = getenv_bool_secure("SYSTEMD_SYSFS_CHECK"); - if (r < 0 && r != -ENXIO) - log_debug_errno(r, "Failed to parse $SYSTEMD_SYSFS_CHECK, ignoring: %m"); - sysfs_check = r != 0; + k = getenv_bool_secure("SYSTEMD_SYSFS_CHECK"); + if (k < 0 && k != -ENXIO) + log_debug_errno(k, "Failed to parse $SYSTEMD_SYSFS_CHECK, ignoring: %m"); + sysfs_check = k != 0; } if (sysfs_check && is_device_path(what)) { |