From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH 1/2] kvm tools: Don't copy network autoconfiguration script Date: Wed, 14 Sep 2011 19:28:25 +0300 Message-ID: <1316017706-12348-1-git-send-email-levinsasha928@gmail.com> Cc: kvm@vger.kernel.org, mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, Sasha Levin To: penberg@kernel.org Return-path: Received: from mail-wy0-f174.google.com ([74.125.82.174]:57224 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757063Ab1INQ3B (ORCPT ); Wed, 14 Sep 2011 12:29:01 -0400 Received: by wyh22 with SMTP id 22so1849623wyh.19 for ; Wed, 14 Sep 2011 09:29:00 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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.6.1