chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
everywhere: port everything to sigprocmask_many() and friends
[elogind.git]
/
src
/
shared
/
machine-image.c
diff --git
a/src/shared/machine-image.c
b/src/shared/machine-image.c
index c5808af81efe27dfb13cdf6805f9b3b3318a3d25..273dacff1f2ac610adf80812ad0669c0e88912f9 100644
(file)
--- a/
src/shared/machine-image.c
+++ b/
src/shared/machine-image.c
@@
-136,12
+136,11
@@
static int image_make(
/* btrfs subvolumes have inode 256 */
if (st.st_ino == 256) {
/* btrfs subvolumes have inode 256 */
if (st.st_ino == 256) {
- struct statfs sfs;
- if (fstatfs(fd, &sfs) < 0)
- return -errno;
-
- if (
F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC)
) {
+ r = btrfs_is_filesystem(fd);
+ if (r < 0)
+ return r;
+ if (
r
) {
BtrfsSubvolInfo info;
BtrfsQuotaInfo quota;
BtrfsSubvolInfo info;
BtrfsQuotaInfo quota;
@@
-358,16
+357,18
@@
int image_remove(Image *i) {
switch (i->type) {
case IMAGE_SUBVOLUME:
switch (i->type) {
case IMAGE_SUBVOLUME:
- return btrfs_subvol_remove(i->path);
+ return btrfs_subvol_remove(i->path
, true
);
case IMAGE_DIRECTORY:
/* Allow deletion of read-only directories */
(void) chattr_path(i->path, false, FS_IMMUTABLE_FL);
case IMAGE_DIRECTORY:
/* Allow deletion of read-only directories */
(void) chattr_path(i->path, false, FS_IMMUTABLE_FL);
-
- /* fall through */
+ return rm_rf(i->path, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_SUBVOLUME);
case IMAGE_RAW:
case IMAGE_RAW:
- return rm_rf(i->path, REMOVE_ROOT|REMOVE_PHYSICAL);
+ if (unlink(i->path) < 0)
+ return -errno;
+
+ return 0;
default:
return -EOPNOTSUPP;
default:
return -EOPNOTSUPP;
@@
-489,7
+490,7
@@
int image_clone(Image *i, const char *new_name, bool read_only) {
case IMAGE_DIRECTORY:
new_path = strjoina("/var/lib/machines/", new_name);
case IMAGE_DIRECTORY:
new_path = strjoina("/var/lib/machines/", new_name);
- r = btrfs_subvol_snapshot(i->path, new_path,
read_only, true
);
+ r = btrfs_subvol_snapshot(i->path, new_path,
(read_only ? BTRFS_SNAPSHOT_READ_ONLY : 0) | BTRFS_SNAPSHOT_FALLBACK_COPY | BTRFS_SNAPSHOT_RECURSIVE
);
break;
case IMAGE_RAW:
break;
case IMAGE_RAW:
@@
-602,7
+603,7
@@
int image_path_lock(const char *path, int operation, LockFile *global, LockFile
return r;
if (p) {
return r;
if (p) {
- mkdir_p("/run/systemd/nspawn/locks", 0
6
00);
+ mkdir_p("/run/systemd/nspawn/locks", 0
7
00);
r = make_lock_file(p, operation, global);
if (r < 0) {
r = make_lock_file(p, operation, global);
if (r < 0) {
@@
-642,7
+643,7
@@
int image_name_lock(const char *name, int operation, LockFile *ret) {
if (streq(name, ".host"))
return -EBUSY;
if (streq(name, ".host"))
return -EBUSY;
- mkdir_p("/run/systemd/nspawn/locks", 0
6
00);
+ mkdir_p("/run/systemd/nspawn/locks", 0
7
00);
p = strjoina("/run/systemd/nspawn/locks/name-", name);
return make_lock_file(p, operation, ret);
p = strjoina("/run/systemd/nspawn/locks/name-", name);
return make_lock_file(p, operation, ret);