diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2015-10-22 17:59:45 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-10-27 17:06:49 +0000 |
| commit | 30867c55012f05f3ad28322bcf86dcfb83b9f21b (patch) | |
| tree | 15b2fdd165faa13815e367d970bef537153dcffe | |
| parent | 1c2a21f054060228e42cdc935275cdd57ca37709 (diff) | |
| download | kvmtool-30867c55012f05f3ad28322bcf86dcfb83b9f21b.tar.gz | |
kvmtool/run: do not overwrite /virt/init
To me kvm_setup_guest_init() behaviour looks "obviously wrong" and
unfriendly because it always overwrites /virt/init.
kvm_setup_guest_init() is also called when we are going to use this
tree as a rootfs, and without another patch ("kvmtool/run: append
cfg.kernel_cmdline at the end of real_cmdline") the user can't use
"lkvm run -p init=my_init_path". This simply means that you can not
use a customized init unless you patch kvmtool.
Change extract_file() to do nothing if the file already exists. This
should not affect do_setup() which calls kvm_setup_guest_init() only
if make_dir(guestfs_name) creates the new/empty dir.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | builtin-setup.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/builtin-setup.c b/builtin-setup.c index 1e5b1e47..8be8d628 100644 --- a/builtin-setup.c +++ b/builtin-setup.c @@ -130,10 +130,14 @@ static int extract_file(const char *guestfs_name, const char *filename, snprintf(path, PATH_MAX, "%s%s/%s", kvm__get_dir(), guestfs_name, filename); - remove(path); - fd = open(path, O_CREAT | O_WRONLY, 0755); - if (fd < 0) + + fd = open(path, O_EXCL | O_CREAT | O_WRONLY, 0755); + if (fd < 0) { + if (errno == EEXIST) + return 0; die("Fail to setup %s", path); + } + ret = xwrite(fd, data, (size_t)_size); if (ret < 0) die("Fail to setup %s", path); |