7eeef124e30ca2123f removes setnet.sh handling through build-in nfs dhcp client. This patch get rid of "kvm setup" functionality to copy the now non-existing setnet script. Otherwise kvm setup is silently aborted.
Signed-off-by: Hagen Paul Pfeifer <[email protected]> Cc: Sasha Levin <[email protected]> --- tools/kvm/builtin-setup.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/tools/kvm/builtin-setup.c b/tools/kvm/builtin-setup.c index c93eec3..6b8eb5b 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); } -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
