diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-11-29 16:49:30 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-12-01 00:25:51 +0100 |
| commit | c4f4fce79e157800212f3cba1b21870097030e81 (patch) | |
| tree | f5ef8b7fb1d3b6de637570ee3ddb1157e151b87e /src/nspawn | |
| parent | a4eaf3cf822dae1d076dfc98afc3ab0d53871dac (diff) | |
fs-util: add flags parameter to chase_symlinks()
Let's remove chase_symlinks_prefix() and instead introduce a flags parameter to
chase_symlinks(), with a flag CHASE_PREFIX_ROOT that exposes the behaviour of
chase_symlinks_prefix().
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn-mount.c | 6 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index 914e43da98..de9e40d55f 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -512,7 +512,7 @@ static int mount_bind(const char *dest, CustomMount *m) { if (stat(m->source, &source_st) < 0) return log_error_errno(errno, "Failed to stat %s: %m", m->source); - r = chase_symlinks_prefix(m->destination, dest, &where); + r = chase_symlinks(m->destination, dest, CHASE_PREFIX_ROOT, &where); if (r < 0) return log_error_errno(r, "Failed to resolve %s: %m", m->destination); @@ -572,7 +572,7 @@ static int mount_tmpfs( assert(dest); assert(m); - r = chase_symlinks_prefix(m->destination, dest, &where); + r = chase_symlinks(m->destination, dest, CHASE_PREFIX_ROOT, &where); if (r < 0) return log_error_errno(r, "Failed to resolve %s: %m", m->destination); @@ -612,7 +612,7 @@ static int mount_overlay(const char *dest, CustomMount *m) { assert(dest); assert(m); - r = chase_symlinks_prefix(m->destination, dest, &where); + r = chase_symlinks(m->destination, dest, CHASE_PREFIX_ROOT, &where); if (r < 0) return log_error_errno(r, "Failed to resolve %s: %m", m->destination); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 624c4f6a40..1a625e142e 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2675,7 +2675,7 @@ static int chase_symlinks_and_update(char **p) { if (!*p) return 0; - r = chase_symlinks(*p, NULL, &chased); + r = chase_symlinks(*p, NULL, 0, &chased); if (r < 0) return log_error_errno(r, "Failed to resolve path %s: %m", *p); |