[PATCH 1/2] kvm tools: Don't copy network autoconfiguration script

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux