From: Zbigniew Jędrzejewski-Szmek Date: Wed, 10 Mar 2021 10:49:02 +0000 (+0100) Subject: fstab-generator: do not propagate error if we fail to canonicalize X-Git-Tag: v248-rc3~2^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1677b88d01729f514dd17145e3aefaa5db6cdf95;p=thirdparty%2Fsystemd.git fstab-generator: do not propagate error if we fail to canonicalize r is used for the return value of the function, so we shouldn't use it a non-fatal check. --- diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 0910a9aa61b..7cb4ea286dc 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -611,11 +611,11 @@ static int parse_fstab(bool initrd) { * /etc/fstab. So we canonicalize here. Note that we use CHASE_NONEXISTENT to handle the case * where a symlink refers to another mount target; this works assuming the sub-mountpoint * target is the final directory. */ - r = chase_symlinks(where, initrd ? "/sysroot" : NULL, + k = chase_symlinks(where, initrd ? "/sysroot" : NULL, CHASE_PREFIX_ROOT | CHASE_NONEXISTENT, &canonical_where, NULL); - if (r < 0) /* If we can't canonicalize we continue on as if it wasn't a symlink */ - log_debug_errno(r, "Failed to read symlink target for %s, ignoring: %m", where); + if (k < 0) /* If we can't canonicalize we continue on as if it wasn't a symlink */ + log_debug_errno(k, "Failed to read symlink target for %s, ignoring: %m", where); else if (streq(canonical_where, where)) /* If it was fully canonicalized, suppress the change */ canonical_where = mfree(canonical_where); else