chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove repeated 'the's
[elogind.git]
/
src
/
shared
/
machine-image.c
diff --git
a/src/shared/machine-image.c
b/src/shared/machine-image.c
index 00337e7c9fe03a6c208e0e16034d45cc5b9bcc71..273dacff1f2ac610adf80812ad0669c0e88912f9 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[] =
@@
-135,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;
@@
-357,19
+357,21
@@
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_dangerous(i->path, false, true, false);
+ if (unlink(i->path) < 0)
+ return -errno;
+
+ return 0;
default:
default:
- return -E
NOTSU
P;
+ return -E
OPNOTSUP
P;
}
}
}
}
@@
-430,7
+432,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)
@@
-488,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:
@@
-498,7
+500,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)
@@
-563,7
+565,7
@@
int image_read_only(Image *i, bool b) {
}
default:
}
default:
- return -E
NOTSU
P;
+ return -E
OPNOTSUP
P;
}
return 0;
}
return 0;
@@
-601,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) {
@@
-622,7
+624,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);
}
@@
-641,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);