Patchwork [hurd,commited] Lookup the startup server through /servers/startup

login
register
mail settings
Submitter Samuel Thibault
Date March 11, 2018, 11:25 p.m.
Message ID <20180311232541.25642-1-samuel.thibault@ens-lyon.org>
Download mbox | patch
Permalink /patch/26280/
State Committed, archived
Headers show

Comments

Samuel Thibault - March 11, 2018, 11:25 p.m.
From: David Michael <fedora.dm0@gmail.com>

* sysdeps/mach/hurd/reboot.c: Include <hurd/paths.h>
(reboot): Lookup _SERVERS_STARTUP instead of calling proc_getmsgport to get a
port to the startup server.
---
 ChangeLog                  | 6 ++++++
 sysdeps/mach/hurd/reboot.c | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

Patch

diff --git a/ChangeLog b/ChangeLog
index eda37a2b31..02d1ccdc68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@ 
+2018-03-12  David Michael <fedora.dm0@gmail.com>
+
+	* sysdeps/mach/hurd/reboot.c: Include <hurd/paths.h>
+	(reboot): Lookup _SERVERS_STARTUP instead of calling proc_getmsgport to
+	get a port to the startup server.
+
 2018-03-11  Zack Weinberg  <zackw@panix.com>
 
 	* sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Include math.h
diff --git a/sysdeps/mach/hurd/reboot.c b/sysdeps/mach/hurd/reboot.c
index a7987e1640..beeb9bfcbc 100644
--- a/sysdeps/mach/hurd/reboot.c
+++ b/sysdeps/mach/hurd/reboot.c
@@ -18,6 +18,7 @@ 
 #include <errno.h>
 #include <unistd.h>
 #include <hurd.h>
+#include <hurd/paths.h>
 #include <hurd/startup.h>
 #include <sys/reboot.h>
 
@@ -33,8 +34,8 @@  reboot (int howto)
   if (err)
     return __hurd_fail (EPERM);
 
-  err = __USEPORT (PROC, __proc_getmsgport (port, 1, &init));
-  if (!err)
+  init = __file_name_lookup (_SERVERS_STARTUP, 0, 0);
+  if (init != MACH_PORT_NULL)
     {
       err = __startup_reboot (init, hostpriv, howto);
       __mach_port_deallocate (__mach_task_self (), init);