diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-11-18 21:35:21 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-12-01 00:25:51 +0100 |
| commit | e187369587b1c6a5f65a12e7ec0bf7844905d014 (patch) | |
| tree | 30d7395e3ed58b073506d37d30d0c5f76aee71cf /src/core/machine-id-setup.c | |
| parent | c9d5c9c0e19eea79ca0f09fe58e5c0b76b8001e2 (diff) | |
| download | systemd-e187369587b1c6a5f65a12e7ec0bf7844905d014.tar.gz | |
tree-wide: stop using canonicalize_file_name(), use chase_symlinks() instead
Let's use chase_symlinks() everywhere, and stop using GNU
canonicalize_file_name() everywhere. For most cases this should not change
behaviour, however increase exposure of our function to get better tested. Most
importantly in a few cases (most notably nspawn) it can take the correct root
directory into account when chasing symlinks.
Diffstat (limited to 'src/core/machine-id-setup.c')
| -rw-r--r-- | src/core/machine-id-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index 76dfcfa6d7..c83bb561c7 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -199,7 +199,7 @@ int machine_id_commit(const char *root) { etc_machine_id = prefix_roota(root, "/etc/machine-id"); - r = path_is_mount_point(etc_machine_id, 0); + r = path_is_mount_point(etc_machine_id, NULL, 0); if (r < 0) return log_error_errno(r, "Failed to determine whether %s is a mount point: %m", etc_machine_id); if (r == 0) { |