shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-21 18:03:41 +03:00
Code

machined: when cloning a raw disk image, also set the NOCOW flag

Browse Source
This commit is contained in:
Lennart Poettering 2015-01-08 19:15:49 +01:00
parent e45fc5e738
commit f2068bcce0
7 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/firstboot/firstboot.c
View File

@ -256,7 +256,7 @@ static int process_locale(void) {
if (arg_copy_locale && arg_root) {
mkdir_parents(etc_localeconf, 0755);
r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644);
r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644, 0);
if (r != -ENOENT) {
if (r < 0)
return log_error_errno(r, "Failed to copy %s: %m", etc_localeconf);

2
src/nspawn/nspawn.c
View File

@ -1092,7 +1092,7 @@ static int setup_resolv_conf(const char *dest) {
return 0;
}
r = copy_file("/etc/resolv.conf", where, O_TRUNC|O_NOFOLLOW, 0644);
r = copy_file("/etc/resolv.conf", where, O_TRUNC|O_NOFOLLOW, 0644, 0);
if (r < 0) {
log_warning_errno(r, "Failed to copy /etc/resolv.conf to %s: %m", where);

9
src/shared/copy.c
View File

@ -359,7 +359,7 @@ int copy_file_fd(const char *from, int fdt, bool try_reflink) {
return r;
}
int copy_file(const char *from, const char *to, int flags, mode_t mode) {
int copy_file(const char *from, const char *to, int flags, mode_t mode, int chattr_flags) {
int fdt, r;
assert(from);
@ -371,6 +371,9 @@ int copy_file(const char *from, const char *to, int flags, mode_t mode) {
return -errno;
}
if (chattr_flags != 0)
(void) chattr_fd(fdt, true, chattr_flags);
r = copy_file_fd(from, fdt, true);
if (r < 0) {
close(fdt);
@ -386,7 +389,7 @@ int copy_file(const char *from, const char *to, int flags, mode_t mode) {
return 0;
}
int copy_file_atomic(const char *from, const char *to, mode_t mode, bool replace) {
int copy_file_atomic(const char *from, const char *to, mode_t mode, bool replace, int chattr_flags) {
_cleanup_free_ char *t;
int r;
@ -397,7 +400,7 @@ int copy_file_atomic(const char *from, const char *to, mode_t mode, bool replace
if (r < 0)
return r;
r = copy_file(from, t, O_NOFOLLOW|O_EXCL, mode);
r = copy_file(from, t, O_NOFOLLOW|O_EXCL, mode, chattr_flags);
if (r < 0)
return r;

4
src/shared/copy.h
View File

@ -25,8 +25,8 @@
#include <sys/types.h>
int copy_file_fd(const char *from, int to, bool try_reflink);
int copy_file(const char *from, const char *to, int flags, mode_t mode);
int copy_file_atomic(const char *from, const char *to, mode_t mode, bool replace);
int copy_file(const char *from, const char *to, int flags, mode_t mode, int chattr_flags);
int copy_file_atomic(const char *from, const char *to, mode_t mode, bool replace, int chattr_flags);
int copy_tree(const char *from, const char *to, bool merge);
int copy_tree_at(int fdf, const char *from, int fdt, const char *to, bool merge);
int copy_directory_fd(int dirfd, const char *to, bool merge);

9
src/shared/machine-image.c
View File

@ -20,6 +20,7 @@
***/
#include <sys/statfs.h>
#include <linux/fs.h>
#include <fcntl.h>
#include "strv.h"
@ -440,7 +441,7 @@ int image_clone(Image *i, const char *new_name, bool read_only) {
case IMAGE_GPT:
new_path = strappenda("/var/lib/container/", new_name, ".gpt");
r = copy_file_atomic(i->path, new_path, read_only ? 0444 : 0644, false);
r = copy_file_atomic(i->path, new_path, read_only ? 0444 : 0644, false, FS_NOCOW_FL);
break;
default:
@ -477,6 +478,12 @@ int image_read_only(Image *i, bool b) {
if (chmod(i->path, (st.st_mode & 0444) | (b ? 0000 : 0200)) < 0)
return -errno;
/* If the images is now read-only, it's a good time to
* defrag it, given that no write patterns will
* fragment it again. */
if (b)
(void) btrfs_defrag(i->path);
break;
}

2
src/systemctl/systemctl.c
View File

@ -5669,7 +5669,7 @@ static int create_edit_temp_file(const char *new_path, const char *original_path
return r;
}
r = copy_file(original_path, t, 0, 0644);
r = copy_file(original_path, t, 0, 0644, 0);
if (r == -ENOENT) {
r = touch(t);
if (r < 0) {

2
src/test/test-copy.c
View File

@ -44,7 +44,7 @@ static void test_copy_file(void) {
assert_se(write_string_file(fn, "foo bar bar bar foo") == 0);
assert_se(copy_file(fn, fn_copy, 0, 0644) == 0);
assert_se(copy_file(fn, fn_copy, 0, 0644, 0) == 0);
assert_se(read_full_file(fn_copy, &buf, &sz) == 0);
assert_se(streq(buf, "foo bar bar bar foo\n"));