Skip to contentSkip to conversation

export net_* variables by default

PATCH In review Andrey Borzenkov 2 participants 2 messages Jun 23, 2013 – Jul 14, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 export net_* variables by default

All those variables reflect physical interface properties, so they are global by nature. Export them by default.

---
 grub-core/net/bootp.c | 6 +++++-
 grub-core/net/net.c   | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
grub-core/net/bootp.c +5 -1
index e0ab47e..72edc21 100644
@@ -49,6 +49,7 @@ set_env_limn_ro (const char *intername, const char *suffix,
   grub_env_set (varname, value);
   value[len] = c;
   grub_register_variable_hook (varname, 0, grub_env_write_readonly);
+  grub_env_export (varname);
 }
 
 static void
@@ -212,7 +213,10 @@ grub_net_configure_by_dhcp_ack (const char *name,
     }
 
   if (is_def)
-    grub_env_set ("net_default_interface", name);
+    {
+      grub_env_set ("net_default_interface", name);
+      grub_env_export ("net_default_interface");
+    }
 
   if (device && !*device && bp->server_ip)
     {
grub-core/net/net.c +6 -0
index 5d2c2f0..4810319 100644
@@ -891,6 +891,7 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
 	*ptr = '_';    
     grub_env_set (name, buf);
     grub_register_variable_hook (name, 0, hwaddr_set_env);
+    grub_env_export (name);
   }
 
   {
@@ -904,6 +905,7 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
 	*ptr = '_';    
     grub_env_set (name, buf);
     grub_register_variable_hook (name, 0, addr_set_env);
+    grub_env_export (name);
   }
 
   inter->card->num_ifaces++;
@@ -1643,12 +1645,16 @@ GRUB_MOD_INIT(net)
 {
   grub_register_variable_hook ("net_default_server", defserver_get_env,
 			       defserver_set_env);
+  grub_env_export ("net_default_server");
   grub_register_variable_hook ("pxe_default_server", defserver_get_env,
 			       defserver_set_env);
+  grub_env_export ("pxe_default_server");
   grub_register_variable_hook ("net_default_ip", defip_get_env,
 			       defip_set_env);
+  grub_env_export ("net_default_ip");
   grub_register_variable_hook ("net_default_mac", defmac_get_env,
 			       defmac_set_env);
+  grub_env_export ("net_default_mac");
 
   cmd_addaddr = grub_register_command ("net_add_addr", grub_cmd_addaddr,
 					/* TRANSLATORS: HWADDRESS stands for
Signature · 1 line
tg: (2cca311..) u/net_var_export (depends on: master)
#1 lore raw

Go ahead.

Quoted 72 lines · Andrey Borzenkov

All those variables reflect physical interface properties, so they are global by nature. Export them by default.

---
  grub-core/net/bootp.c | 6 +++++-
  grub-core/net/net.c   | 6 ++++++
  2 files changed, 11 insertions(+), 1 deletion(-)
grub-core/net/bootp.c +5 -1
index e0ab47e..72edc21 100644
@@ -49,6 +49,7 @@ set_env_limn_ro (const char *intername, const char *suffix,
    grub_env_set (varname, value);
    value[len] = c;
    grub_register_variable_hook (varname, 0, grub_env_write_readonly);
+  grub_env_export (varname);
  }
 
  static void
@@ -212,7 +213,10 @@ grub_net_configure_by_dhcp_ack (const char *name,
      }
 
    if (is_def)
-    grub_env_set ("net_default_interface", name);
+    {
+      grub_env_set ("net_default_interface", name);
+      grub_env_export ("net_default_interface");
+    }
 
    if (device && !*device && bp->server_ip)
      {
grub-core/net/net.c +6 -0
index 5d2c2f0..4810319 100644
@@ -891,6 +891,7 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
  	*ptr = '_';
      grub_env_set (name, buf);
      grub_register_variable_hook (name, 0, hwaddr_set_env);
+    grub_env_export (name);
    }
 
    {
@@ -904,6 +905,7 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
  	*ptr = '_';
      grub_env_set (name, buf);
      grub_register_variable_hook (name, 0, addr_set_env);
+    grub_env_export (name);
    }
 
    inter->card->num_ifaces++;
@@ -1643,12 +1645,16 @@ GRUB_MOD_INIT(net)
  {
    grub_register_variable_hook ("net_default_server", defserver_get_env,
  			       defserver_set_env);
+  grub_env_export ("net_default_server");
    grub_register_variable_hook ("pxe_default_server", defserver_get_env,
  			       defserver_set_env);
+  grub_env_export ("pxe_default_server");
    grub_register_variable_hook ("net_default_ip", defip_get_env,
  			       defip_set_env);
+  grub_env_export ("net_default_ip");
    grub_register_variable_hook ("net_default_mac", defmac_get_env,
  			       defmac_set_env);
+  grub_env_export ("net_default_mac");
 
    cmd_addaddr = grub_register_command ("net_add_addr", grub_cmd_addaddr,
  					/* TRANSLATORS: HWADDRESS stands for