entered into RCS

2 files changed, 37 insertions, 11 deletions

diff --git a/libnetfs/demuxer.c b/libnetfs/demuxer.c
index 522c13d2..6b4f727f 100644
--- a/libnetfs/demuxer.c
+++ b/libnetfs/demuxer.c
@@ -24,18 +24,16 @@ int
 netfs_demuxer (mach_msg_header_t *inp,
 	       mach_msg_header_t *outp)
 {
-  int diskfs_fs_server (mach_msg_header_t *, mach_msg_header_t *);
-  int diskfs_io_server (mach_msg_header_t *, mach_msg_header_t *);
-  int diskfs_fsys_server (mach_msg_header_t *, mach_msg_header_t *);
-  int diskfs_exec_startup_server (mach_msg_header_t *, mach_msg_header_t *);
-  int diskfs_ifsock_server (mach_msg_header_t *, mach_msg_header_t *);
-
-  return (diskfs_io_server (inp, outp)
-          || diskfs_fs_server (inp, outp)
+  int netfs_fs_server (mach_msg_header_t *, mach_msg_header_t *);
+  int netfs_io_server (mach_msg_header_t *, mach_msg_header_t *);
+  int netfs_fsys_server (mach_msg_header_t *, mach_msg_header_t *);
+  int netfs_ifsock_server (mach_msg_header_t *, mach_msg_header_t *);
+
+  return (netfs_io_server (inp, outp)
+          || netfs_fs_server (inp, outp)
           || ports_notify_server (inp, outp)
-          || diskfs_fsys_server (inp, outp)
-          || diskfs_exec_startup_server (inp, outp)
+          || netfs_fsys_server (inp, outp)
           || ports_interrupt_server (inp, outp)
-          || (diskfs_shortcut_ifsock ? diskfs_ifsock_server (inp, outp) : 0));
+          || netfs_ifsock_server (inp, outp));
 }
 
diff --git a/libnetfs/shutdown.c b/libnetfs/shutdown.c
new file mode 100644
index 00000000..8e4c7a68
--- /dev/null
+++ b/libnetfs/shutdown.c
@@ -0,0 +1,28 @@
+/* 
+   Copyright (C) 1996 Free Software Foundation, Inc.
+   Written by Michael I. Bushnell, p/BSG.
+
+   This file is part of the GNU Hurd.
+
+   The GNU Hurd is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   The GNU Hurd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
+
+#include "netfs.h"
+
+error_t
+netfs_shutdown (int flags)
+{
+  return EBUSY;
+}
+