Kernel-parameter "ip=" is used to assign network configuration.
With linux kernel 3.7 it is also possible to set nameserver IPs.
This patch adds two new variables (nameserver0 and nameserver1) to
barebox's $net configuration.
Signed-off-by: Christoph Fritz <chf.fritz@xxxxxxxxxxxxxx>
---
net/dhcp.c | 2 +-
net/dns.c | 4 ++--
net/net.c | 18 +++++++++++++++++-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/net/dhcp.c b/net/dhcp.c
index 768255e..118a5a6 100644
--- a/net/dhcp.c
+++ b/net/dhcp.c
@@ -211,7 +211,7 @@ struct dhcp_opt dhcp_options[] = {
}, {
.option = 6,
.handle = env_ip_handle,
- .barebox_var_name = "net.nameserver",
+ .barebox_var_name = "net.nameserver0",
}, {
.option = 12,
.copy_only_if_valid = 1,
diff --git a/net/dns.c b/net/dns.c
index eb96c57..e832f97 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -206,9 +206,9 @@ IPaddr_t resolv(char *host)
dns_state = STATE_INIT;
- ns = getenv("net.nameserver");
+ ns = getenv("net.nameserver0");
if (!ns || !*ns) {
- printk("%s: no nameserver specified in $net.nameserver\n",
+ printk("%s: no nameserver specified in $net.nameserver0\n",
__func__);
return 0;
}
diff --git a/net/net.c b/net/net.c
index 3ac098f..171e644 100644
--- a/net/net.c
+++ b/net/net.c
@@ -669,6 +669,21 @@ static struct device_d net_device = {
.id = DEVICE_ID_SINGLE,
};
+static int net_set_namesrv(struct device_d *dev, struct param_d *param, const char *val)
+{
+ IPaddr_t ip;
+
+ if (!val)
+ return -EINVAL;
+
+ if (string_to_ip(val, &ip))
+ return -EINVAL;
+
+ dev_param_set_generic(dev, param, val);
+
+ return 0;
+}
+
static int net_init(void)
{
int i;
@@ -677,7 +692,8 @@ static int net_init(void)
NetRxPackets[i] = net_alloc_packet();
register_device(&net_device);
- dev_add_param(&net_device, "nameserver", NULL, NULL, 0);
+ dev_add_param(&net_device, "nameserver0", net_set_namesrv, NULL, 0);
+ dev_add_param(&net_device, "nameserver1", net_set_namesrv, NULL, 0);
dev_add_param(&net_device, "domainname", NULL, NULL, 0);
return 0;
--
1.7.2.5
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
