From f85ef957e647c5182acf5e64298f68e4b7fbfe8f Mon Sep 17 00:00:00 2001 From: Alban Crequy Date: Tue, 10 Mar 2015 18:15:52 +0100 Subject: 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. --- src/shared/machine-image.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/shared/machine-image.c') 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) -- cgit v1.2.3-54-g00ecf