]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
kvm tools: Don't copy network autoconfiguration script
authorSasha Levin <levinsasha928@gmail.com>
Wed, 14 Sep 2011 16:28:25 +0000 (19:28 +0300)
committerSasha Levin <levinsasha928@gmail.com>
Fri, 16 Sep 2011 08:53:06 +0000 (11:53 +0300)
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>
tools/kvm/builtin-setup.c

index c93eec3a94cb721f01cfa2bac9b2ecaae426ecb7..6b8eb5b13849d59cf451cefdbbece80498787d91 100644 (file)
@@ -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);
 }