diff options
| author | Alban Crequy <alban@endocode.com> | 2015-03-10 18:15:52 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-03-10 18:23:46 +0100 |
| commit | f85ef957e647c5182acf5e64298f68e4b7fbfe8f (patch) | |
| tree | 505151f058adc41e72d262d044cc2b0092a148aa /src/shared/machine-image.c | |
| parent | 27cc6f166bdebc0e698fb692993b801db2618866 (diff) | |
util: add rename_noreplace
renameat2() exists since Linux 3.15 but btrfs support for the flag
RENAME_NOREPLACE was added later.
This patch implements a fallback when renameat2() returns EINVAL.
EINVAL is the error returned when the filesystem does not support one of
the flags.
Diffstat (limited to 'src/shared/machine-image.c')
| -rw-r--r-- | src/shared/machine-image.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c index 552847e0f0..00337e7c9f 100644 --- a/src/shared/machine-image.c +++ b/src/shared/machine-image.c @@ -440,8 +440,9 @@ int image_rename(Image *i, const char *new_name) { if (!nn) return -ENOMEM; - if (renameat2(AT_FDCWD, i->path, AT_FDCWD, new_path, RENAME_NOREPLACE) < 0) - return -errno; + r = rename_noreplace(AT_FDCWD, i->path, AT_FDCWD, new_path); + if (r < 0) + return r; /* Restore the immutable bit, if it was set before */ if (file_attr & FS_IMMUTABLE_FL) |