From beb941ed81f87d85e6ca9238622681cfbddbc142 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Sun, 14 Jan 2007 00:06:23 +0000
Subject: Rename "boot" to "autoboot"

---
 src/config.h                    |  2 +-
 src/core/config.c               |  4 ++--
 src/hci/commands/autoboot_cmd.c | 25 +++++++++++++++++++++++++
 src/hci/commands/boot_cmd.c     | 25 -------------------------
 4 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 src/hci/commands/autoboot_cmd.c
 delete mode 100644 src/hci/commands/boot_cmd.c

(limited to 'src')

diff --git a/src/config.h b/src/config.h
index a219d6454..3748a4c04 100644
--- a/src/config.h
+++ b/src/config.h
@@ -116,7 +116,7 @@
  * Command-line commands to include
  *
  */
-#define	BOOT_CMD		/* Automatic booting */
+#define	AUTOBOOT_CMD		/* Automatic booting */
 #define	NVO_CMD			/* Non-volatile option storage commands */
 #define	CONFIG_CMD		/* Option configuration console */
 #define	IFMGMT_CMD		/* Interface management commands */
diff --git a/src/core/config.c b/src/core/config.c
index b27ad6c1e..31ae8d5a9 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -145,8 +145,8 @@ REQUIRE_OBJECT ( script );
  * Drag in all requested commands
  *
  */
-#ifdef BOOT_CMD
-REQUIRE_OBJECT ( boot_cmd );
+#ifdef AUTOBOOT_CMD
+REQUIRE_OBJECT ( autoboot_cmd );
 #endif
 #ifdef NVO_CMD
 REQUIRE_OBJECT ( nvo_cmd );
diff --git a/src/hci/commands/autoboot_cmd.c b/src/hci/commands/autoboot_cmd.c
new file mode 100644
index 000000000..d7fb2e1fb
--- /dev/null
+++ b/src/hci/commands/autoboot_cmd.c
@@ -0,0 +1,25 @@
+#include <vsprintf.h>
+#include <gpxe/command.h>
+#include <usr/autoboot.h>
+
+static int autoboot_exec ( int argc, char **argv ) {
+
+	if ( argc != 1 ) {
+		printf ( "Usage:\n"
+			 "  %s\n"
+			 "\n"
+			 "Attempts to boot the system\n",
+			 argv[0] );
+		return 1;
+	}
+
+	autoboot();
+
+	/* Can never return success by definition */
+	return 1;
+}
+
+struct command autoboot_command __command = {
+	.name = "autoboot",
+	.exec = autoboot_exec,
+};
diff --git a/src/hci/commands/boot_cmd.c b/src/hci/commands/boot_cmd.c
deleted file mode 100644
index fd8cba740..000000000
--- a/src/hci/commands/boot_cmd.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <vsprintf.h>
-#include <gpxe/command.h>
-#include <usr/autoboot.h>
-
-static int boot_exec ( int argc, char **argv ) {
-
-	if ( argc != 1 ) {
-		printf ( "Usage:\n"
-			 "  %s\n"
-			 "\n"
-			 "Attempts to boot the system\n",
-			 argv[0] );
-		return 1;
-	}
-
-	autoboot();
-
-	/* Can never return success by definition */
-	return 1;
-}
-
-struct command boot_command __command = {
-	.name = "boot",
-	.exec = boot_exec,
-};
-- 
cgit v1.2.3-55-g7522