mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 6/8] Make hostname available to C Code
Date: Thu, 15 Aug 2013 09:28:59 +0200	[thread overview]
Message-ID: <1376551741-16438-7-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1376551741-16438-1-git-send-email-s.hauer@pengutronix.de>

The boards often have a sane default for the hostname. Provide a C
function for setting/getting it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/misc.c    | 34 ++++++++++++++++++++++++++++++++++
 include/common.h |  2 ++
 net/dhcp.c       |  1 -
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/common/misc.c b/common/misc.c
index bb7d447..4ec0e22 100644
--- a/common/misc.c
+++ b/common/misc.c
@@ -19,6 +19,9 @@
 #include <common.h>
 #include <errno.h>
 #include <malloc.h>
+#include <magicvar.h>
+#include <globalvar.h>
+#include <environment.h>
 
 int errno;
 EXPORT_SYMBOL(errno);
@@ -149,3 +152,34 @@ const char *barebox_get_model(void)
 	return CONFIG_BOARDINFO;
 }
 EXPORT_SYMBOL(barebox_get_model);
+
+BAREBOX_MAGICVAR_NAMED(global_model, global.model, "Product name of this hardware");
+
+static char *hostname;
+
+/*
+ * The hostname is supposed to be the shortname of a board. It should
+ * contain only lowercase letters, numbers, '-', '_'. No whitespaces
+ * allowed.
+ */
+void barebox_set_hostname(const char *__hostname)
+{
+	if (IS_ENABLED(CONFIG_GLOBALVAR)) {
+		globalvar_add_simple("hostname", __hostname);
+	} else {
+		free(hostname);
+		hostname = xstrdup(__hostname);
+	}
+}
+
+const char *barebox_get_hostname(void)
+{
+	if (IS_ENABLED(CONFIG_GLOBALVAR))
+		return getenv("global.hostname");
+
+	return hostname;
+}
+EXPORT_SYMBOL(barebox_get_hostname);
+
+BAREBOX_MAGICVAR_NAMED(global_hostname, global.hostname,
+		"shortname of the board. Also used as hostname for DHCP requests");
diff --git a/include/common.h b/include/common.h
index 7d05d8b..7173efb 100644
--- a/include/common.h
+++ b/include/common.h
@@ -236,6 +236,8 @@ static inline void barebox_banner(void) {}
 
 const char *barebox_get_model(void);
 void barebox_set_model(const char *);
+const char *barebox_get_hostname(void);
+void barebox_set_hostname(const char *);
 
 #define IOMEM(addr)	((void __force __iomem *)(addr))
 
diff --git a/net/dhcp.c b/net/dhcp.c
index cafefcb..ff54924 100644
--- a/net/dhcp.c
+++ b/net/dhcp.c
@@ -830,7 +830,6 @@ BAREBOX_CMD_START(dhcp)
 	BAREBOX_CMD_COMPLETE(empty_complete)
 BAREBOX_CMD_END
 
-BAREBOX_MAGICVAR_NAMED(global_hostname, global.hostname, "hostname to send or returned from DHCP request");
 BAREBOX_MAGICVAR_NAMED(global_dhcp_bootfile, global.dhcp.bootfile, "bootfile returned from DHCP request");
 BAREBOX_MAGICVAR_NAMED(global_dhcp_rootpath, global.dhcp.rootpath, "rootpath returned from DHCP request");
 BAREBOX_MAGICVAR_NAMED(global_dhcp_vendor_id, global.dhcp.vendor_id, "vendor id to send to the DHCP server");
-- 
1.8.4.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2013-08-15  7:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-15  7:28 [PATCH] move BOARDINFO to globalvar Sascha Hauer
2013-08-15  7:28 ` [PATCH 1/8] globalvar: Allow to set initial value Sascha Hauer
2013-08-15  7:28 ` [PATCH 2/8] Add a global.version variable Sascha Hauer
2013-08-15  7:28 ` [PATCH 3/8] globalvar: move globalvar init to pure_initcall Sascha Hauer
2013-08-15  7:28 ` [PATCH 4/8] remove remaining references of CONFIG_BOARDINFO Sascha Hauer
2013-08-15  7:28 ` [PATCH 5/8] introduce barebox_set_model Sascha Hauer
2013-08-15  7:28 ` Sascha Hauer [this message]
2013-08-15  7:29 ` [PATCH 7/8] Set model and hostname at boardlevel Sascha Hauer
2013-08-15  7:39   ` Alexander Shiyan
2013-08-15  9:13     ` Sascha Hauer
2013-08-15  9:07   ` Sebastian Hesselbarth
2013-08-15  9:13     ` Sascha Hauer
2013-08-15  9:19       ` Sebastian Hesselbarth
2013-08-15  7:29 ` [PATCH 8/8] export model as globalvar Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1376551741-16438-7-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox