pci-arbiter, rumpdisk: Rename options for bootstrap chain

We may end up with an arbitrary series of bootstrap translators, which
can know about each other through devices, and thus do not need any
particular order except dependencies. The actual bootstrap order can
thus be arbitrary (provided it respects dependencies), so better not
hardcode it.

1 files changed, 6 insertions, 6 deletions

diff --git a/pci-arbiter/options.c b/pci-arbiter/options.c
index 141c69e3..73f74ca3 100644
--- a/pci-arbiter/options.c
+++ b/pci-arbiter/options.c
@@ -241,8 +241,8 @@ parse_opt (int opt, char *arg, struct argp_state *state)
     case 'n':
       h->ncache_len = atoi (arg);
       break;
-    case 'T':
-      h->disk_server_task = atoi (arg);
+    case 'N':
+      h->next_task = atoi (arg);
       break;
     case 'H':
       h->host_priv_port = atoi (arg);
@@ -259,7 +259,7 @@ parse_opt (int opt, char *arg, struct argp_state *state)
       h->permsets = 0;
       h->num_permsets = 0;
       h->ncache_len = NODE_CACHE_MAX;
-      h->disk_server_task = MACH_PORT_NULL;
+      h->next_task = MACH_PORT_NULL;
       h->host_priv_port = MACH_PORT_NULL;
       h->dev_master_port = MACH_PORT_NULL;
       err = parse_hook_add_set (h);
@@ -299,7 +299,7 @@ parse_opt (int opt, char *arg, struct argp_state *state)
       fs->params.node_cache_max = h->ncache_len;
 
       /* Set bootstrap ports */
-      fs->params.disk_server_task = h->disk_server_task;
+      fs->params.next_task = h->next_task;
       _hurd_host_priv = h->host_priv_port;
       _hurd_device_master = h->dev_master_port;
 
@@ -381,8 +381,8 @@ netfs_append_args (char **argz, size_t * argz_len)
   if (fs->params.node_cache_max != NODE_CACHE_MAX)
     ADD_OPT ("--ncache=%u", fs->params.node_cache_max);
 
-  if (fs->params.disk_server_task != MACH_PORT_NULL)
-    ADD_OPT ("--disk-server-task=%lu", fs->params.disk_server_task);
+  if (fs->params.next_task != MACH_PORT_NULL)
+    ADD_OPT ("--next-task=%lu", fs->params.next_task);
 #undef ADD_OPT
   return err;
 }