|
 |
31004e6 |
From 95329b0fbbbd6c7258c275a27ed904bdae11caad Mon Sep 17 00:00:00 2001
|
|
|
31004e6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
Date: Tue, 7 May 2013 12:05:36 +0200
|
|
|
f74b50e |
Subject: [PATCH 437/482] New variables 'net_default_*' to determine
|
|
|
31004e6 |
MAC/IP of default interface.
|
|
|
31004e6 |
|
|
|
31004e6 |
---
|
|
|
31004e6 |
ChangeLog | 4 +++
|
|
|
31004e6 |
grub-core/net/bootp.c | 3 +++
|
|
|
31004e6 |
grub-core/net/net.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
|
31004e6 |
3 files changed, 75 insertions(+), 1 deletion(-)
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
31004e6 |
index 67b4c6f..cbd5d97 100644
|
|
|
31004e6 |
--- a/ChangeLog
|
|
|
31004e6 |
+++ b/ChangeLog
|
|
|
31004e6 |
@@ -1,5 +1,9 @@
|
|
|
31004e6 |
2013-05-07 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
|
|
|
31004e6 |
+ New variables 'net_default_*' to determine MAC/IP of default interface.
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+2013-05-07 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
+
|
|
|
31004e6 |
* tests/gettext_strings_test.in: A test to check for strings not
|
|
|
31004e6 |
marked for translation.
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
|
|
|
31004e6 |
index 33f860a..c8ef4d6 100644
|
|
|
31004e6 |
--- a/grub-core/net/bootp.c
|
|
|
31004e6 |
+++ b/grub-core/net/bootp.c
|
|
|
31004e6 |
@@ -211,6 +211,9 @@ grub_net_configure_by_dhcp_ack (const char *name,
|
|
|
31004e6 |
grub_print_error ();
|
|
|
31004e6 |
}
|
|
|
31004e6 |
|
|
|
31004e6 |
+ if (is_def)
|
|
|
31004e6 |
+ grub_env_set ("net_default_interface", name);
|
|
|
31004e6 |
+
|
|
|
31004e6 |
if (device && !*device && bp->server_ip)
|
|
|
31004e6 |
{
|
|
|
31004e6 |
*device = grub_xasprintf ("tftp,%d.%d.%d.%d",
|
|
|
31004e6 |
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
|
|
31004e6 |
index aebbe4b..8ea6906 100644
|
|
|
31004e6 |
--- a/grub-core/net/net.c
|
|
|
31004e6 |
+++ b/grub-core/net/net.c
|
|
|
31004e6 |
@@ -1,6 +1,6 @@
|
|
|
31004e6 |
/*
|
|
|
31004e6 |
* GRUB -- GRand Unified Bootloader
|
|
|
31004e6 |
- * Copyright (C) 2010,2011 Free Software Foundation, Inc.
|
|
|
31004e6 |
+ * Copyright (C) 2010,2011,2012,2013 Free Software Foundation, Inc.
|
|
|
31004e6 |
*
|
|
|
31004e6 |
* GRUB is free software: you can redistribute it and/or modify
|
|
|
31004e6 |
* it under the terms of the GNU General Public License as published by
|
|
|
31004e6 |
@@ -813,6 +813,69 @@ defserver_get_env (struct grub_env_var *var __attribute__ ((unused)),
|
|
|
31004e6 |
return grub_net_default_server ? : "";
|
|
|
31004e6 |
}
|
|
|
31004e6 |
|
|
|
31004e6 |
+static const char *
|
|
|
31004e6 |
+defip_get_env (struct grub_env_var *var __attribute__ ((unused)),
|
|
|
31004e6 |
+ const char *val __attribute__ ((unused)))
|
|
|
31004e6 |
+{
|
|
|
31004e6 |
+ const char *intf = grub_env_get ("net_default_interface");
|
|
|
31004e6 |
+ const char *ret = NULL;
|
|
|
31004e6 |
+ if (intf)
|
|
|
31004e6 |
+ {
|
|
|
31004e6 |
+ char *buf = grub_xasprintf ("net_%s_ip", intf);
|
|
|
31004e6 |
+ if (buf)
|
|
|
31004e6 |
+ ret = grub_env_get (buf);
|
|
|
31004e6 |
+ grub_free (buf);
|
|
|
31004e6 |
+ }
|
|
|
31004e6 |
+ return ret;
|
|
|
31004e6 |
+}
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+static char *
|
|
|
31004e6 |
+defip_set_env (struct grub_env_var *var __attribute__ ((unused)),
|
|
|
31004e6 |
+ const char *val)
|
|
|
31004e6 |
+{
|
|
|
31004e6 |
+ const char *intf = grub_env_get ("net_default_interface");
|
|
|
31004e6 |
+ if (intf)
|
|
|
31004e6 |
+ {
|
|
|
31004e6 |
+ char *buf = grub_xasprintf ("net_%s_ip", intf);
|
|
|
31004e6 |
+ if (buf)
|
|
|
31004e6 |
+ grub_env_set (buf, val);
|
|
|
31004e6 |
+ grub_free (buf);
|
|
|
31004e6 |
+ }
|
|
|
31004e6 |
+ return NULL;
|
|
|
31004e6 |
+}
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+static const char *
|
|
|
31004e6 |
+defmac_get_env (struct grub_env_var *var __attribute__ ((unused)),
|
|
|
31004e6 |
+ const char *val __attribute__ ((unused)))
|
|
|
31004e6 |
+{
|
|
|
31004e6 |
+ const char *intf = grub_env_get ("net_default_interface");
|
|
|
31004e6 |
+ const char *ret = NULL;
|
|
|
31004e6 |
+ if (intf)
|
|
|
31004e6 |
+ {
|
|
|
31004e6 |
+ char *buf = grub_xasprintf ("net_%s_mac", intf);
|
|
|
31004e6 |
+ if (buf)
|
|
|
31004e6 |
+ ret = grub_env_get (buf);
|
|
|
31004e6 |
+ grub_free (buf);
|
|
|
31004e6 |
+ }
|
|
|
31004e6 |
+ return ret;
|
|
|
31004e6 |
+}
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+static char *
|
|
|
31004e6 |
+defmac_set_env (struct grub_env_var *var __attribute__ ((unused)),
|
|
|
31004e6 |
+ const char *val)
|
|
|
31004e6 |
+{
|
|
|
31004e6 |
+ const char *intf = grub_env_get ("net_default_interface");
|
|
|
31004e6 |
+ if (intf)
|
|
|
31004e6 |
+ {
|
|
|
31004e6 |
+ char *buf = grub_xasprintf ("net_%s_mac", intf);
|
|
|
31004e6 |
+ if (buf)
|
|
|
31004e6 |
+ grub_env_set (buf, val);
|
|
|
31004e6 |
+ grub_free (buf);
|
|
|
31004e6 |
+ }
|
|
|
31004e6 |
+ return NULL;
|
|
|
31004e6 |
+}
|
|
|
31004e6 |
+
|
|
|
31004e6 |
|
|
|
31004e6 |
static void
|
|
|
31004e6 |
grub_net_network_level_interface_register (struct grub_net_network_level_interface *inter)
|
|
|
31004e6 |
@@ -1560,6 +1623,10 @@ GRUB_MOD_INIT(net)
|
|
|
31004e6 |
defserver_set_env);
|
|
|
31004e6 |
grub_register_variable_hook ("pxe_default_server", defserver_get_env,
|
|
|
31004e6 |
defserver_set_env);
|
|
|
31004e6 |
+ grub_register_variable_hook ("net_default_ip", defip_get_env,
|
|
|
31004e6 |
+ defip_set_env);
|
|
|
31004e6 |
+ grub_register_variable_hook ("net_default_mac", defmac_get_env,
|
|
|
31004e6 |
+ defmac_set_env);
|
|
|
31004e6 |
|
|
|
31004e6 |
cmd_addaddr = grub_register_command ("net_add_addr", grub_cmd_addaddr,
|
|
|
31004e6 |
/* TRANSLATORS: HWADDRESS stands for
|
|
|
31004e6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
31004e6 |
|