From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UqqDb-0007Yx-Fq for mharc-grub-devel@gnu.org; Sun, 23 Jun 2013 15:44:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqqDY-0007YW-Lg for grub-devel@gnu.org; Sun, 23 Jun 2013 15:44:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UqqDX-00020n-IU for grub-devel@gnu.org; Sun, 23 Jun 2013 15:44:56 -0400 Received: from mail-la0-x233.google.com ([2a00:1450:4010:c03::233]:53173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqqDX-00020N-Aj for grub-devel@gnu.org; Sun, 23 Jun 2013 15:44:55 -0400 Received: by mail-la0-f51.google.com with SMTP id fq12so9254929lab.24 for ; Sun, 23 Jun 2013 12:44:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=uqIrbtl7WXhrqkL67cGLOmHCsu97Z399wK/K32xO2Qo=; b=J+Zzs7Fmi0wsze0yiegYugBlMCz1whKyTTucs8jeNXn5dFcMJFxC4zUJ19mf6XAV6J DOP0zvfu7G2O06NQjEDT6OzeeaSB7s+8s84o30puZ9GLQbUTlCfDEyysDu6JbHwu3gAJ iy/Q724hnwZhVINcl8BCr3IGORlP9YU/GcHtCg0qsVVcmmnAC/pSKeZOPs6HbDhEZYJH xpjSMaF+OyzD2Luv4x+UyUZ+A5kHyxvj4wzTkNthOsZ2StKDZP1iLM4FCP00p111WT6p +TaKLRQPUL4x3XKq9Sse6vEi+CUm6pdYVXcIr9v7HRAzpV3+HlEoUfkT90Xu8D8A9NwE VYlg== X-Received: by 10.152.8.198 with SMTP id t6mr10011101laa.36.1372016693698; Sun, 23 Jun 2013 12:44:53 -0700 (PDT) Received: from localhost.localdomain (ppp79-139-160-84.pppoe.spdop.ru. [79.139.160.84]) by mx.google.com with ESMTPSA id 6sm5298038lbu.13.2013.06.23.12.44.53 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 23 Jun 2013 12:44:53 -0700 (PDT) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] export net_* variables by default Date: Sun, 23 Jun 2013 23:44:50 +0400 Message-Id: <1372016690-24114-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::233 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jun 2013 19:44:57 -0000 All those variables reflect physical interface properties, so they are global by nature. Export them by default. Signed-off-by: Andrey Borzenkov --- grub-core/net/bootp.c | 6 +++++- grub-core/net/net.c | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c index e0ab47e..72edc21 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -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) { diff --git a/grub-core/net/net.c b/grub-core/net/net.c index 5d2c2f0..4810319 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -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 -- tg: (2cca311..) u/net_var_export (depends on: master)