diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-09-19 09:15:02 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-11-21 05:49:03 +0100 |
| commit | 5ee314b6c1ffd8b090ca6771f0896e080f7000ef (patch) | |
| tree | f6d20c43e718f887060f9c2c4e6e78fffed26407 /exec | |
| parent | dcafd2d6cc7a98744b08875b35caf218a4a5c14a (diff) | |
startup: bind the startup server to /servers/startup
Previously, the Hurd (ab)used the fact that the startup server speaks
all protocols on its message port. Any server that wished to register
for shutdown notifications would use proc_getmsgport to get a port to
the startup server.
This hardcodes the PID of /hurd/startup, and does not allow one to
point a server to ones own startup server (e.g. using remap).
Bind the startup server to /servers/startup instead. Use this to
contact the startup server.
* exec/main.c (S_exec_init): Use /servers/startup. Fall back to the
old method so that the system still boots when the node
/servers/startup is missing.
* hurd/paths.h (_SERVERS_STARTUP): New macro.
* libdiskfs/boot-start.c (diskfs_S_fsys_init): Use /servers/startup.
* libdiskfs/init-startup.c (_diskfs_init_completed): Likewise.
* pfinet/main.c (arrange_shutdown_notification): Likewise.
* startup/Makefile (OBJS): Add fsysServer.o.
* startup/startup.c (demuxer): Handle the fsys protocol.
(main): Bind to /servers/startup.
(S_fsys_getroot): Implement fsys_getroot. Stub out the rest.
Diffstat (limited to 'exec')
| -rw-r--r-- | exec/main.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/exec/main.c b/exec/main.c index 784000b8..c86c000f 100644 --- a/exec/main.c +++ b/exec/main.c @@ -331,8 +331,15 @@ S_exec_init (struct trivfs_protid *protid, proc_register_version (procserver, host_priv, "exec", "", HURD_VERSION); - err = proc_getmsgport (procserver, HURD_PID_STARTUP, &startup); - assert_perror (err); + startup = file_name_lookup (_SERVERS_STARTUP, 0, 0); + if (startup == MACH_PORT_NULL) + { + error (0, errno, "%s", _SERVERS_STARTUP); + + /* Fall back to abusing the message port lookup. */ + err = proc_getmsgport (procserver, HURD_PID_STARTUP, &startup); + assert_perror (err); + } mach_port_deallocate (mach_task_self (), procserver); /* Call startup_essential task last; init assumes we are ready to |