[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 15/64: startup: rename /hurd/init to /hurd/startup
From: |
Samuel Thibault |
Subject: |
[hurd] 15/64: startup: rename /hurd/init to /hurd/startup |
Date: |
Wed, 10 Dec 2014 15:17:04 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit 0224d569030e6838c63cf946ae7321be923afc23
Author: Justus Winter <address@hidden>
Date: Tue Sep 17 13:44:44 2013 +0200
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.
---
Makefile | 3 ++-
doc/hurd.texi | 6 +++---
hurd/paths.h | 2 +-
libdiskfs/boot-start.c | 2 +-
libdiskfs/opts-std-startup.c | 2 +-
{init => startup}/Makefile | 6 +++---
init/init.c => startup/startup.c | 2 +-
{init => startup}/stubs.c | 0
8 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 0b9eff2..455df67 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ lib-subdirs = libshouldbeinlibc libihash libiohelp libports
libthreads \
libnetfs libpipe libstore libhurdbugaddr libftpconn libcons
# Hurd programs
-prog-subdirs = auth proc exec init term \
+prog-subdirs = auth proc exec term \
ext2fs isofs tmpfs fatfs \
storeio pflocal pfinet defpager mach-defpager \
login daemons boot console \
@@ -40,6 +40,7 @@ prog-subdirs = auth proc exec init term \
benchmarks fstests \
random \
procfs \
+ startup \
ifeq ($(HAVE_SUN_RPC),yes)
prog-subdirs += nfs nfsd
diff --git a/doc/hurd.texi b/doc/hurd.texi
index 697cce7..7e7b5ee 100644
--- a/doc/hurd.texi
+++ b/doc/hurd.texi
@@ -563,10 +563,10 @@ bootstrapped by starting the GNU Mach microkernel and two
programs:
the root filesystem and the exec server.
The @option{--multiboot-command-line} option tells the file system server that
-it is a root filesystem, which triggers it to run @command{/hurd/init} as PID
-2. @command{/hurd/init} starts the @command{/hurd/proc} and
+it is a root filesystem, which triggers it to run @command{/hurd/startup} as
PID
+2. @command{/hurd/startup} starts the @command{/hurd/proc} and
@command{/hurd/auth} servers. After the servers are launched
address@hidden/hurd/init} starts the @command{/libexec/runsystem.sh} script to
address@hidden/hurd/startup} starts the @command{/libexec/runsystem.sh} script
to
finish booting.
After the Hurd has been booted, other sets of core Hurd servers can be
diff --git a/hurd/paths.h b/hurd/paths.h
index 92875b2..0042f76 100644
--- a/hurd/paths.h
+++ b/hurd/paths.h
@@ -39,7 +39,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA
02139, USA. */
the canonical pathname being /hurd/foo. */
#define _HURD "/hurd/"
-#define _HURD_INIT _HURD "init"
+#define _HURD_STARTUP _HURD "startup"
#define _HURD_PROC _HURD "proc"
#define _HURD_AUTH _HURD "auth"
diff --git a/libdiskfs/boot-start.c b/libdiskfs/boot-start.c
index a590975..42e991e 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 6fe2875..ed25a18 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,
diff --git a/init/Makefile b/startup/Makefile
similarity index 94%
rename from init/Makefile
rename to startup/Makefile
index ffb82ff..2d6b892 100644
--- a/init/Makefile
+++ b/startup/Makefile
@@ -15,14 +15,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-dir := init
+dir := startup
makemode := server
-SRCS = init.c stubs.c
+SRCS = startup.c stubs.c
OBJS = $(SRCS:.c=.o) \
startupServer.o notifyServer.o startup_replyUser.o msgServer.o \
startup_notifyUser.o
-target = init
+target = startup
HURDLIBS = shouldbeinlibc
include ../Makeconf
diff --git a/init/init.c b/startup/startup.c
similarity index 99%
rename from init/init.c
rename to startup/startup.c
index 6bc6701..29269a6 100644
--- a/init/init.c
+++ b/startup/startup.c
@@ -63,7 +63,7 @@ static int crash_flags = RB_AUTOBOOT;
#define BOOT(flags) ((flags & RB_HALT) ? "halt" : "reboot")
-const char *argp_program_version = STANDARD_HURD_VERSION (init);
+const char *argp_program_version = STANDARD_HURD_VERSION (startup);
static struct argp_option
options[] =
diff --git a/init/stubs.c b/startup/stubs.c
similarity index 100%
rename from init/stubs.c
rename to startup/stubs.c
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] branch upstream updated (e4a9a4d -> 4c7abe4), Samuel Thibault, 2014/12/10
- [hurd] 09/64: Fix recording complete path of passive relative translators, Samuel Thibault, 2014/12/10
- [hurd] 10/64: Fix compiler warning, Samuel Thibault, 2014/12/10
- [hurd] 12/64: trans/mtab: avoid firmlink loops, Samuel Thibault, 2014/12/10
- [hurd] 15/64: startup: rename /hurd/init to /hurd/startup,
Samuel Thibault <=
- [hurd] 11/64: Always canonicalize fstab entries with realpath, Samuel Thibault, 2014/12/10
- [hurd] 23/64: startup: also open `console' for reading, Samuel Thibault, 2014/12/10
- [hurd] 26/64: boot: drop obsolete device procedures, Samuel Thibault, 2014/12/10
- [hurd] 16/64: init: add a minimalist init program, Samuel Thibault, 2014/12/10
- [hurd] 22/64: proc: gracefully handle failure to increase priority, Samuel Thibault, 2014/12/10
- [hurd] 25/64: boot: remove unused function `boot_script_read_file', Samuel Thibault, 2014/12/10
- [hurd] 31/64: libdiskfs: fix fabrication of protid, Samuel Thibault, 2014/12/10
- [hurd] 17/64: startup: do not pass signals on to the child, Samuel Thibault, 2014/12/10
- [hurd] 29/64: boot: improve the demuxer, Samuel Thibault, 2014/12/10
- [hurd] 14/64: procfs: do not hard-code the default argument values, Samuel Thibault, 2014/12/10