X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=bc7e186a1921e8531bb2fd37ed026f5e47e5977e;hp=87075fcf91925666ed2b8c13757d13dff45b59fc;hb=d67d5beceef94686818ce264b2ca93f82b66e8f4;hpb=59dbd08e2a8354e71578c0d7ca2283951a384801

diff --git a/discover/network.c b/discover/network.c
index 87075fc..bc7e186 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -69,7 +69,7 @@ static const struct interface_config *find_config_by_hwaddr(
 		uint8_t *hwaddr)
 {
 	const struct config *config;
-	int i;
+	unsigned int i;
 
 	config = config_get();
 	if (!config)
@@ -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,
@@ -484,7 +485,8 @@ retry:
 static void network_init_dns(struct network *network)
 {
 	const struct config *config;
-	int i, rc, len;
+	unsigned int i;
+	int rc, len;
 	bool modified;
 	char *buf;
 
@@ -545,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);