From f0aec23a91368e916a53e6072f2173bb481b1544 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Tue, 9 Aug 2011 20:46:08 +0300 Subject: [PATCH] kvm tools: Enable kernel DHCP autoconf by default As we boot to '/bin/sh' by default, enable kernel DHCP autoconfiguration too. The guest kernel needs to be configured with the following configuration options: CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y Cc: Asias He Cc: Avi Kivity Cc: Cyrill Gorcunov Cc: Ingo Molnar Cc: Linus Torvalds Cc: Prasad Joshi Cc: Sasha Levin Signed-off-by: Pekka Enberg --- tools/kvm/README | 3 +++ tools/kvm/builtin-run.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/kvm/README b/tools/kvm/README index 5b85461bd96c..2cf93645b2c5 100644 --- a/tools/kvm/README +++ b/tools/kvm/README @@ -70,6 +70,9 @@ linux-0.2.img.bz2 - For virtio-rng device (--rng): CONFIG_HW_RANDOM_VIRTIO=y + - For kernel DHCP autoconf (when booting to /bin/sh): + CONFIG_IP_PNP=y + CONFIG_IP_PNP_DHCP=y 5. And finally, launch the hypervisor: diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index fa5de27ad2ac..af7f59c6fbe2 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -601,7 +601,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) using_rootfs = 1; if (!strstr(real_cmdline, "init=")) - strlcat(real_cmdline, " init=/bin/sh ", sizeof(real_cmdline)); + strlcat(real_cmdline, " init=/bin/sh ip=dhcp ", sizeof(real_cmdline)); } if (!strstr(real_cmdline, "root=")) -- 2.39.5