summaryrefslogtreecommitdiff
path: root/src/import
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-12-25 03:19:19 +0100
committerLennart Poettering <lennart@poettering.net>2014-12-25 03:19:19 +0100
commit10f9c75519671e7c7ab8993b54fe22da7c2d0c38 (patch)
tree78777a123c0261f892af164581884f8a07756203 /src/import
parent5fa89b2cb366d533e56a9b7a9ce548480776f973 (diff)
machined: beef up machined image listing with creation/modification times of subvolumes
We make use of the btrfs subvol crtime for this, and for gpt images of a manually managed xattr, if we can.
Diffstat (limited to 'src/import')
-rw-r--r--src/import/import-dkr.c2
-rw-r--r--src/import/import-gpt.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c
index 8f26191c40..b290619305 100644
--- a/src/import/import-dkr.c
+++ b/src/import/import-dkr.c
@@ -780,7 +780,7 @@ static void dkr_import_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result
goto fail;
}
- r = btrfs_subvol_read_only(job->temp_path, true);
+ r = btrfs_subvol_set_read_only(job->temp_path, true);
if (r < 0) {
log_error_errno(r, "Failed to mark snapshot read-only: %m");
goto fail;
diff --git a/src/import/import-gpt.c b/src/import/import-gpt.c
index 503f1e64cf..a81efa2bba 100644
--- a/src/import/import-gpt.c
+++ b/src/import/import-gpt.c
@@ -171,6 +171,8 @@ static void gpt_import_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result
ut[1] = ut[0];
(void) futimens(f->disk_fd, ut);
+
+ fd_setcrtime(f->disk_fd, f->mtime);
}
if (fstat(f->disk_fd, &st) < 0) {