summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2015-02-11 14:02:52 +0100
committerMichael Brown2015-02-11 15:11:22 +0100
commit544a6a9769112661b7831e114db4bf06c13baa67 (patch)
tree57f179d752eea4c839e52740bfeafc7843476230
parent[build] Move branding information to config/branding.h (diff)
downloadipxe-544a6a9769112661b7831e114db4bf06c13baa67.tar.gz
ipxe-544a6a9769112661b7831e114db4bf06c13baa67.tar.xz
ipxe-544a6a9769112661b7831e114db4bf06c13baa67.zip
[build] Use PRODUCT_SHORT_NAME for end-user visible strings
Use PRODUCT_SHORT_NAME instead of a hardcoded "iPXE" for strings which are typically shown in the user interface. Note that this only allows for customisation of the user interface. Where the "iPXE" string serves a technical purpose (such as in the HTTP User-Agent), the string cannot be customised. Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/arch/i386/prefix/romprefix.S3
-rw-r--r--src/hci/shell.c3
-rw-r--r--src/hci/tui/settings_ui.c3
-rw-r--r--src/usr/autoboot.c8
4 files changed, 11 insertions, 6 deletions
diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/i386/prefix/romprefix.S
index 03ab8c78..d1ceb0b4 100644
--- a/src/arch/i386/prefix/romprefix.S
+++ b/src/arch/i386/prefix/romprefix.S
@@ -590,7 +590,8 @@ init_message:
.ascii "\n"
.ascii PRODUCT_NAME
.ascii "\n"
- .asciz "iPXE (http://ipxe.org)"
+ .ascii PRODUCT_SHORT_NAME
+ .asciz " (http://ipxe.org)"
.size init_message, . - init_message
.ifeqs BUSTYPE, "PCIR"
init_message_pci:
diff --git a/src/hci/shell.c b/src/hci/shell.c
index c1a54384..c91d22e1 100644
--- a/src/hci/shell.c
+++ b/src/hci/shell.c
@@ -28,6 +28,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <ipxe/command.h>
#include <ipxe/parseopt.h>
#include <ipxe/shell.h>
+#include <config/branding.h>
/** @file
*
@@ -36,7 +37,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
*/
/** The shell prompt string */
-static const char shell_prompt[] = "iPXE> ";
+static const char shell_prompt[] = PRODUCT_SHORT_NAME "> ";
/**
* "help" command
diff --git a/src/hci/tui/settings_ui.c b/src/hci/tui/settings_ui.c
index 22183973..b2e019e7 100644
--- a/src/hci/tui/settings_ui.c
+++ b/src/hci/tui/settings_ui.c
@@ -30,6 +30,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <ipxe/keys.h>
#include <ipxe/ansicol.h>
#include <ipxe/settings_ui.h>
+#include <config/branding.h>
/** @file
*
@@ -348,7 +349,7 @@ static void draw_title_row ( struct setting_widget *widget ) {
clearmsg ( TITLE_ROW );
name = settings_name ( widget->settings );
attron ( A_BOLD );
- msg ( TITLE_ROW, "iPXE configuration settings%s%s",
+ msg ( TITLE_ROW, PRODUCT_SHORT_NAME " configuration settings%s%s",
( name[0] ? " - " : "" ), name );
attroff ( A_BOLD );
}
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index 2e52c87b..42718ee1 100644
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -42,6 +42,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <usr/prompt.h>
#include <usr/autoboot.h>
#include <config/general.h>
+#include <config/branding.h>
/** @file
*
@@ -522,7 +523,8 @@ static int shell_banner ( void ) {
/* Prompt user */
printf ( "\n" );
- return ( prompt ( "Press Ctrl-B for the iPXE command line...",
+ return ( prompt ( "Press Ctrl-B for the " PRODUCT_SHORT_NAME
+ " command line...",
( ( BANNER_TIMEOUT * TICKS_PER_SEC ) / 10 ),
CTRL_B ) == 0 );
}
@@ -549,10 +551,10 @@ void ipxe ( struct net_device *netdev ) {
* do so.
*
*/
- printf ( NORMAL "\n\n%s\n" BOLD "iPXE %s"
+ printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s"
NORMAL " -- Open Source Network Boot Firmware -- "
CYAN "http://ipxe.org" NORMAL "\n"
- "Features:", product_name, product_version );
+ "Features:", product_version );
for_each_table_entry ( feature, FEATURES )
printf ( " %s", feature->name );
printf ( "\n" );