From: Sasha Levin Date: Wed, 14 Sep 2011 16:28:25 +0000 (+0300) Subject: kvm tools: Don't copy network autoconfiguration script X-Git-Tag: next-20110920~2^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=98ee903fd414366fbc1f72ed787b189a51f15c38;p=karo-tx-linux.git 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 --- diff --git a/tools/kvm/builtin-setup.c b/tools/kvm/builtin-setup.c index c93eec3a94cb..6b8eb5b13849 100644 --- a/tools/kvm/builtin-setup.c +++ b/tools/kvm/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); }