chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rm-rf: never cross mount points
[elogind.git]
/
src
/
shared
/
machine-image.c
diff --git
a/src/shared/machine-image.c
b/src/shared/machine-image.c
index 552847e0f0119890255d3244629dcecd3cbd8d41..c5808af81efe27dfb13cdf6805f9b3b3318a3d25 100644
(file)
--- a/
src/shared/machine-image.c
+++ b/
src/shared/machine-image.c
@@
-28,6
+28,7
@@
#include "path-util.h"
#include "copy.h"
#include "mkdir.h"
#include "path-util.h"
#include "copy.h"
#include "mkdir.h"
+#include "rm-rf.h"
#include "machine-image.h"
static const char image_search_path[] =
#include "machine-image.h"
static const char image_search_path[] =
@@
-366,10
+367,10
@@
int image_remove(Image *i) {
/* fall through */
case IMAGE_RAW:
/* fall through */
case IMAGE_RAW:
- return rm_rf
_dangerous(i->path, false, true, false
);
+ return rm_rf
(i->path, REMOVE_ROOT|REMOVE_PHYSICAL
);
default:
default:
- return -E
NOTSU
P;
+ return -E
OPNOTSUP
P;
}
}
}
}
@@
-430,7
+431,7
@@
int image_rename(Image *i, const char *new_name) {
}
default:
}
default:
- return -E
NOTSU
P;
+ return -E
OPNOTSUP
P;
}
if (!new_path)
}
if (!new_path)
@@
-440,8
+441,9
@@
int image_rename(Image *i, const char *new_name) {
if (!nn)
return -ENOMEM;
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)
/* Restore the immutable bit, if it was set before */
if (file_attr & FS_IMMUTABLE_FL)
@@
-497,7
+499,7
@@
int image_clone(Image *i, const char *new_name, bool read_only) {
break;
default:
break;
default:
- return -E
NOTSU
P;
+ return -E
OPNOTSUP
P;
}
if (r < 0)
}
if (r < 0)
@@
-562,7
+564,7
@@
int image_read_only(Image *i, bool b) {
}
default:
}
default:
- return -E
NOTSU
P;
+ return -E
OPNOTSUP
P;
}
return 0;
}
return 0;
@@
-621,7
+623,7
@@
int image_set_limit(Image *i, uint64_t referenced_max) {
return -EROFS;
if (i->type != IMAGE_SUBVOLUME)
return -EROFS;
if (i->type != IMAGE_SUBVOLUME)
- return -E
NOTSU
P;
+ return -E
OPNOTSUP
P;
return btrfs_quota_limit(i->path, referenced_max);
}
return btrfs_quota_limit(i->path, referenced_max);
}