#include <linux/fs.h>
#include <fcntl.h>
-#include "strv.h"
#include "utf8.h"
#include "btrfs-util.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[] =
i->read_only = read_only;
i->crtime = crtime;
i->mtime = mtime;
- i->size = i->size_exclusive = (uint64_t) -1;
+ i->usage = i->usage_exclusive = (uint64_t) -1;
i->limit = i->limit_exclusive = (uint64_t) -1;
i->name = strdup(pretty);
assert(filename);
/* We explicitly *do* follow symlinks here, since we want to
- * allow symlinking trees into /var/lib/container/, and treat
+ * allow symlinking trees into /var/lib/machines/, and treat
* them normally. */
if (fstatat(dfd, filename, &st, 0) < 0)
r = btrfs_subvol_get_quota_fd(fd, "a);
if (r >= 0) {
- (*ret)->size = quota.referred;
- (*ret)->size_exclusive = quota.exclusive;
+ (*ret)->usage = quota.referenced;
+ (*ret)->usage_exclusive = quota.exclusive;
- (*ret)->limit = quota.referred_max;
+ (*ret)->limit = quota.referenced_max;
(*ret)->limit_exclusive = quota.exclusive_max;
}
return 1;
- } else if (S_ISREG(st.st_mode) && endswith(filename, ".gpt")) {
+ } else if (S_ISREG(st.st_mode) && endswith(filename, ".raw")) {
usec_t crtime = 0;
- /* It's a GPT block device */
+ /* It's a RAW disk image */
if (!ret)
return 1;
if (!pretty)
pretty = strndupa(filename, strlen(filename) - 4);
- r = image_new(IMAGE_GPT,
+ r = image_new(IMAGE_RAW,
pretty,
path,
filename,
if (r < 0)
return r;
- (*ret)->size = (*ret)->size_exclusive = st.st_blocks * 512;
+ (*ret)->usage = (*ret)->usage_exclusive = st.st_blocks * 512;
(*ret)->limit = (*ret)->limit_exclusive = st.st_size;
return 1;
r = image_make(NULL, dirfd(d), path, name, ret);
if (r == 0 || r == -ENOENT) {
- _cleanup_free_ char *gpt = NULL;
+ _cleanup_free_ char *raw = NULL;
- gpt = strappend(name, ".gpt");
- if (!gpt)
+ raw = strappend(name, ".raw");
+ if (!raw)
return -ENOMEM;
- r = image_make(NULL, dirfd(d), path, gpt, ret);
+ r = image_make(NULL, dirfd(d), path, raw, ret);
if (r == 0 || r == -ENOENT)
continue;
}
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);
+ return rm_rf(i->path, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_SUBVOLUME);
- /* fall through */
+ case IMAGE_RAW:
+ if (unlink(i->path) < 0)
+ return -errno;
- case IMAGE_GPT:
- return rm_rf_dangerous(i->path, false, true, false);
+ return 0;
default:
- return -ENOTSUP;
+ return -EOPNOTSUPP;
}
}
new_path = file_in_same_dir(i->path, new_name);
break;
- case IMAGE_GPT: {
+ case IMAGE_RAW: {
const char *fn;
- fn = strappenda(new_name, ".gpt");
+ fn = strjoina(new_name, ".raw");
new_path = file_in_same_dir(i->path, fn);
break;
}
default:
- return -ENOTSUP;
+ return -EOPNOTSUPP;
}
if (!new_path)
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)
case IMAGE_SUBVOLUME:
case IMAGE_DIRECTORY:
- new_path = strappenda("/var/lib/container/", new_name);
+ 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_GPT:
- new_path = strappenda("/var/lib/container/", new_name, ".gpt");
+ case IMAGE_RAW:
+ new_path = strjoina("/var/lib/machines/", new_name, ".raw");
r = copy_file_atomic(i->path, new_path, read_only ? 0444 : 0644, false, FS_NOCOW_FL);
break;
default:
- return -ENOTSUP;
+ return -EOPNOTSUPP;
}
if (r < 0)
break;
- case IMAGE_GPT: {
+ case IMAGE_RAW: {
struct stat st;
if (stat(i->path, &st) < 0)
}
default:
- return -ENOTSUP;
+ return -EOPNOTSUPP;
}
return 0;
return 0;
}
+int image_set_limit(Image *i, uint64_t referenced_max) {
+ assert(i);
+
+ if (path_equal(i->path, "/") ||
+ path_startswith(i->path, "/usr"))
+ return -EROFS;
+
+ if (i->type != IMAGE_SUBVOLUME)
+ return -EOPNOTSUPP;
+
+ return btrfs_quota_limit(i->path, referenced_max);
+}
+
int image_name_lock(const char *name, int operation, LockFile *ret) {
const char *p;
return -EBUSY;
mkdir_p("/run/systemd/nspawn/locks", 0600);
- p = strappenda("/run/systemd/nspawn/locks/name-", name);
+ p = strjoina("/run/systemd/nspawn/locks/name-", name);
return make_lock_file(p, operation, ret);
}
static const char* const image_type_table[_IMAGE_TYPE_MAX] = {
[IMAGE_DIRECTORY] = "directory",
[IMAGE_SUBVOLUME] = "subvolume",
- [IMAGE_GPT] = "gpt",
+ [IMAGE_RAW] = "raw",
};
DEFINE_STRING_TABLE_LOOKUP(image_type, ImageType);