X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=bc7e186a1921e8531bb2fd37ed026f5e47e5977e;hp=0490be9074486355ce436c173aeabb181affac64;hb=d67d5beceef94686818ce264b2ca93f82b66e8f4;hpb=9239fd1ec121fc6c6eda49ef5c2dab081a026785 diff --git a/discover/network.c b/discover/network.c index 0490be9..bc7e186 100644 --- a/discover/network.c +++ b/discover/network.c @@ -219,6 +219,7 @@ static void configure_interface_dhcp(struct interface *interface) pb_system_apps.udhcpc, "-R", "-n", + "-O", "pxeconffile", "-p", pidfile, "-i", interface->name, NULL, @@ -546,8 +547,8 @@ struct network *network_init(struct device_handler *handler, network = talloc(handler, struct network); list_init(&network->interfaces); network->handler = handler; - network->manual_config = false; network->dry_run = dry_run; + network->manual_config = config_get()->network.n_interfaces != 0; network_init_dns(network);