From 0224d569030e6838c63cf946ae7321be923afc23 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Tue, 17 Sep 2013 13:44:44 +0200
Subject: startup: rename /hurd/init to /hurd/startup

This patch series splits /hurd/init into two programs.  As a first
step, this patch renames /hurd/init to /hurd/startup.  It is called
startup because it speaks the startup protocol.

* startup: Rename init to startup.  Adjust accordingly.
* Makefile (prog-subdirs): Likewise.
* doc/hurd.texi (Server Bootstrap): Likewise.
* hurd/paths.h (_HURD_STARTUP): Likewise.
* libdiskfs/boot-start.c (diskfs_boot_init_program): Likewise.
* libdiskfs/opts-std-startup.c (startup_options): Likewise.
---
 libdiskfs/boot-start.c       | 2 +-
 libdiskfs/opts-std-startup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libdiskfs')

diff --git a/libdiskfs/boot-start.c b/libdiskfs/boot-start.c
index a5909758..42e991e6 100644
--- a/libdiskfs/boot-start.c
+++ b/libdiskfs/boot-start.c
@@ -46,7 +46,7 @@ static task_t parent_task = MACH_PORT_NULL;
 static pthread_mutex_t execstartlock;
 static pthread_cond_t execstarted;
 
-const char *diskfs_boot_init_program = _HURD_INIT;
+const char *diskfs_boot_init_program = _HURD_STARTUP;
 
 static void start_execserver ();
 
diff --git a/libdiskfs/opts-std-startup.c b/libdiskfs/opts-std-startup.c
index 6fe28758..ed25a18d 100644
--- a/libdiskfs/opts-std-startup.c
+++ b/libdiskfs/opts-std-startup.c
@@ -59,7 +59,7 @@ startup_options[] =
    "Required for bootstrap filesystem, the multiboot kernel command line"},
   {"bootflags", 0, 0, OPTION_ALIAS|OPTION_HIDDEN},
   {"boot-init-program",  OPT_BOOT_INIT_PROGRAM,  "FILE", 0,
-   "For bootstrap filesystem, init program to run (default " _HURD_INIT ")"},
+   "For bootstrap filesystem, init program to run (default " _HURD_STARTUP ")"},
   {"boot-debug-pause",  OPT_BOOT_PAUSE,	         0, 0,
    "Pause for keystroke before starting bootstrap programs"},
   {"boot-command",	 OPT_BOOT_COMMAND,	 0, 0,
-- 
cgit v1.2.3