diff options
| author | Sasha Levin <levinsasha928@gmail.com> | 2011-09-14 19:28:25 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-06-01 16:39:47 +0100 |
| commit | 4f62ec93cd5e0f123bb1cd1f75863c79a6b71f11 (patch) | |
| tree | 71920148f7c2389454ff4914c5c09f2821fa0706 /builtin-setup.c | |
| parent | 1add4b76d64864e9b43f0057a21d9b80cd1f6ac1 (diff) | |
| download | kvmtool-4f62ec93cd5e0f123bb1cd1f75863c79a6b71f11.tar.gz | |
kvm tools: Don't copy network autoconfiguration script
Network autoconfiguration was moved to the kernel, but the setup code still
tried to copy the script over to the rootfs. This prevented from /virt/ to
be properly created.
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Diffstat (limited to 'builtin-setup.c')
| -rw-r--r-- | builtin-setup.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/builtin-setup.c b/builtin-setup.c index c93eec3a..6b8eb5b1 100644 --- a/builtin-setup.c +++ b/builtin-setup.c @@ -129,15 +129,6 @@ static int copy_init(const char *guestfs_name) return copy_file("guest/init", path); } -static int copy_net(const char *guestfs_name) -{ - char path[PATH_MAX]; - - snprintf(path, PATH_MAX, "%s%s%s/virt/setnet.sh", HOME_DIR, KVM_PID_FILE_PATH, guestfs_name); - - return copy_file("guest/setnet.sh", path); -} - static int make_guestfs_symlink(const char *guestfs_name, const char *path) { char target[PATH_MAX]; @@ -195,10 +186,6 @@ static int do_setup(const char *guestfs_name) make_guestfs_symlink(guestfs_name, guestfs_symlinks[i]); } - ret = copy_net(guestfs_name); - if (ret < 0) - return ret; - return copy_init(guestfs_name); } |