Remove `serverboot'; fix "make dist" in `mach-defpager'.

* serverboot/default_pager.c, serverboot/kalloc.c, serverboot/queue.h,
  serverboot/wiring.c, serverboot/wiring.h: Move to `mach-defpager/'.

* serverboot/Makefile, serverboot/assert.h, serverboot/bootstrap.c,
  serverboot/bunzip2.c, serverboot/def_pager_setup.c, serverboot/defs.h,
  serverboot/dir.h, serverboot/disk_inode.h,
  serverboot/disk_inode_ffs.h, serverboot/elf-load.c, serverboot/exec.c,
  serverboot/ext2_file_io.c, serverboot/ffs_compat.c,
  serverboot/ffs_compat.h, serverboot/ffs_file_io.c,
  serverboot/file_io.c, serverboot/file_io.h, serverboot/fs.h,
  serverboot/gets.c, serverboot/gunzip.c, serverboot/load.c,
  serverboot/mach-exec.h, serverboot/minix_ffs_compat.c,
  serverboot/minix_ffs_compat.h, serverboot/minix_file_io.c,
  serverboot/minix_fs.h, serverboot/minix_super.h, serverboot/panic.c,
  serverboot/strfcns.c: Remove.

* mach-defpager/Makefile (LCLHDRS): New variable.
  (vpath): Remove.
  (CPPFLAGS): Remove `-I$(srcdir)/../serverboot'.

* mach-defpager/setup.c (page_aligned): Make public.

1 files changed, 0 insertions, 438 deletions

diff --git a/serverboot/bootstrap.c b/serverboot/bootstrap.c
deleted file mode 100644
index 64f7c5eb..00000000
--- a/serverboot/bootstrap.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * Mach Operating System
- * Copyright (c) 1992,1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-/*
- * Bootstrap the various built-in servers.
- */
-
-#include <mach.h>
-#include <mach/message.h>
-#include <sys/reboot.h>
-
-#include <file_io.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include "../boot/boot_script.h"
-
-#if 0
-/*
- *	Use 8 Kbyte stacks instead of the default 64K.
- *	Use 4 Kbyte waiting stacks instead of the default 8K.
- */
-#if	defined(alpha)
-vm_size_t	cthread_stack_size = 16 * 1024;
-#else
-vm_size_t	cthread_stack_size = 8 * 1024;
-#endif
-#endif
-
-extern
-vm_size_t	cthread_wait_stack_size;
-
-mach_port_t	bootstrap_master_device_port;	/* local name */
-mach_port_t	bootstrap_master_host_port;	/* local name */
-
-int	boot_load_program();
-
-char	*root_name;
-char	boot_script_name[MAXPATHLEN];
-
-extern void	default_pager();
-extern void	default_pager_initialize();
-extern void	default_pager_setup();
-
-/*
- * Convert ASCII to integer.
- */
-int atoi(str)
-	register const char *str;
-{
-	register int	n;
-	register int	c;
-	int	is_negative = 0;
-
-	n = 0;
-	while (*str == ' ')
-	    str++;
-	if (*str == '-') {
-	    is_negative = 1;
-	    str++;
-	}
-	while ((c = *str++) >= '0' && c <= '9') {
-	    n = n * 10 + (c - '0');
-	}
-	if (is_negative)
-	    n = -n;
-	return (n);
-}
-
-__main ()
-{
-}
-
-static void
-boot_panic (kern_return_t err)
-{
-#define PFX "bootstrap: "
-  char *err_string = boot_script_error_string (err);
-  char panic_string[strlen (err_string) + sizeof (PFX)];
-  strcpy (panic_string, PFX);
-  strcat (panic_string, err_string);
-  panic (panic_string);
-#undef PFX
-}
-
-void
-safe_gets (char *str, int maxlen)
-{
-  char *c = fgets (str, maxlen, stdin);
-  if (c == 0) {
-    perror ("fgets");
-    panic ("cannot read from console");
-  }
-  c = strchr (c, '\n');
-  if (c)
-    *c = '\0';
-  printf ("\r\n");
-}
-
-printf_init (device_t master)
-{
-  mach_port_t cons;
-  kern_return_t rc;
-  rc = device_open (master, D_READ|D_WRITE, "console", &cons);
-  if (rc)
-    while (1) {
-      volatile int x = 0;
-      (void) host_reboot(bootstrap_master_host_port, RB_DEBUGGER);
-      x = x / x;
-  }
-  stdin = mach_open_devstream (cons, "r");
-  stdout = stderr = mach_open_devstream (cons, "w");
-  mach_port_deallocate (mach_task_self (), cons);
-  setbuf (stdout, 0);
-}
-
-/*
- * Bootstrap task.
- * Runs in user spacep.
- *
- * Called as 'boot -switches host_port device_port root_name'
- *
- */
-main(argc, argv)
-	int	argc;
-	char	**argv;
-{
-  int die = 0;
-  int script_paging_file (const struct cmd *cmd, integer_t *val)
-    {
-      printf ("*** paging files no longer supported in boot scripts ***\n\a"
-	      "*** use swapon %s and/or /etc/fstab instead ***\n",
-	      cmd->path);
-      return 0;
-    }
-  int script_serverboot_ctl (const struct cmd *cmd, integer_t *val)
-    {
-      const char *const ctl = cmd->path;
-      if (!strcmp (ctl, "die"))
-	die = 1;
-      else
-	printf ("(serverboot): Unknown control word `%s' ignored\n", ctl);
-      return 0;
-    }
-
-  void prompt_for_root ()
-    {
-      static char new_root[MAXPATHLEN/2];
-
-      if (!root_name)
-	root_name = "UNKNOWN";
-      printf ("Root device name? [%s] ", root_name);
-      safe_gets(new_root, sizeof(new_root));
-
-      if (new_root[0] != '\0') {
-	root_name = new_root;
-	(void) strbuild(boot_script_name,
-			"/dev/",
-			root_name,
-			"/boot/servers.boot",
-			(char *)0);
-      }
-    }
-
-  register kern_return_t	result;
-  struct file scriptf;
-
-	task_t			my_task = mach_task_self();
-
-	char			*flag_string;
-
-	boolean_t		ask_boot_script = 0;
-	boolean_t		ask_root_name = 0;
-
-	/*
-	 * Use 4Kbyte cthread wait stacks.
-	 */
-	cthread_wait_stack_size = 4 * 1024;
-
-	/*
-	 * Arg 1 is flags
-	 */
-	if (argv[1][0] != '-')
-	  panic("bootstrap: no flags");
-
-	flag_string = argv[1];
-
-	/*
-	 * Parse the arguments.
-	 */
-	if (argc >= 5)
-	  {
-	    /*
-	     * Arg 0 is program name
-	     */
-
-	    /*
-	     * Arg 2 is host port number
-	     */
-	    bootstrap_master_host_port = atoi(argv[2]);
-
-	    /*
-	     * Arg 3 is device port number
-	     */
-	    bootstrap_master_device_port = atoi(argv[3]);
-
-	    /*
-	     * Arg 4 is root name
-	     */
-	    root_name = argv[4];
-	  }
-	else if (argc == 3)
-	  {
-	    root_name = argv[2];
-
-	    get_privileged_ports (&bootstrap_master_host_port,
-				  &bootstrap_master_device_port);
-	  }
-
-	printf_init(bootstrap_master_device_port);
-#ifdef pleasenoXXX
-	panic_init(bootstrap_master_host_port);
-#endif
-
-
-	/*
-	 * If the '-a' (ask) switch was specified, or if no
-	 * root device was specificed, ask for the root device.
-	 */
-
-	if (!root_name || root_name [0] == '\0' || index(flag_string, 'a'))
-	  prompt_for_root ();
-
-	(void) strbuild(boot_script_name,
-			"/dev/",
-			root_name,
-			"/boot/servers.boot",
-			(char *)0);
-	/*
-	 * If the '-q' (query) switch was specified, ask for the
-	 * server boot script.
-	 */
-
-	if (index(flag_string, 'q'))
-	    ask_boot_script = TRUE;
-
-	while (TRUE) {
-	  if (ask_root_name)
-	    prompt_for_root ();
-
-	    if (ask_boot_script) {
-		char new_boot_script[MAXPATHLEN];
-
-		printf("Server boot script? [%s] ", boot_script_name);
-		safe_gets(new_boot_script, sizeof(new_boot_script));
-		if (new_boot_script[0] != '\0')
-		    strcpy(boot_script_name, new_boot_script);
-	    }
-
-	    result = open_file(bootstrap_master_device_port,
-			       boot_script_name,
-			       &scriptf);
-	    if (result == D_NO_SUCH_DEVICE)
-	      {
-		printf ("Root device `%s' does not exist!\n", root_name);
-		ask_root_name = ask_boot_script = TRUE;
-		continue;
-	      }
-	    else
-	      ask_root_name = FALSE;
-	    if (result != 0) {
-		printf("Can't open server boot script %s: %s\n",
-			boot_script_name,
-			strerror (result));
-		ask_boot_script = TRUE;
-		continue;
-	    }
-	    break;
-	}
-
-	/*
-	 * If the server boot script name was changed,
-	 * then use the new device name as the root device.
-	 */
-	{
-		char *dev, *end;
-		int len;
-
-		dev = boot_script_name;
-		if (strncmp(dev, "/dev/", 5) == 0)
-			dev += 5;
-		end = strchr(dev, '/');
-		len = end ? end-dev : strlen(dev);
-		memcpy(root_name, dev, len);
-		root_name[len] = 0;
-	}
-
-	{
-	  char *cmdline;
-
-	  /* Initialize boot script variables.  */
-	  if (boot_script_set_variable ("host-port", VAL_PORT,
-					(integer_t) bootstrap_master_host_port)
-	      || boot_script_set_variable ("device-port", VAL_PORT,
-					   (integer_t) bootstrap_master_device_port)
-	      || boot_script_set_variable ("root-device", VAL_STR,
-					   (integer_t) root_name)
-	      || boot_script_set_variable ("boot-args", VAL_STR,
-					   (integer_t) flag_string)
-	      || boot_script_define_function ("add-paging-file", VAL_NONE,
-					      &script_paging_file)
-	      || boot_script_define_function ("add-raw-paging-file", VAL_NONE,
-					      &script_paging_file)
-	      || boot_script_define_function ("add-linux-paging-file",
-					      VAL_NONE,
-					      &script_paging_file)
-	      || boot_script_define_function ("serverboot",
-					      VAL_NONE,
-					      &script_serverboot_ctl)
-	      )
-	    panic ("bootstrap: error setting boot script variables");
-
-	  cmdline = getenv ("MULTIBOOT_CMDLINE");
-	  if (cmdline != NULL
-	      && boot_script_set_variable ("kernel-command-line",
-					   VAL_STR,
-					   (integer_t) cmdline))
-	    panic ("bootstrap: error setting boot script variables");
-
-	  parse_script (&scriptf);
-	  close_file (&scriptf);
-	}
-
-	if (index (flag_string, 'd'))
-	  {
-	    char xx[5];
-	    printf ("Hit return to boot...");
-	    safe_gets (xx, sizeof xx);
-	  }
-
-	result = boot_script_exec ();
-
-	if (result)
-	  boot_panic (result);
-
-#if 0
-	{
-	    /*
-	     * Delete the old stack (containing only the arguments).
-	     */
-	    vm_offset_t	addr = (vm_offset_t) argv;
-
-	    vm_offset_t		r_addr;
-	    vm_size_t		r_size;
-	    vm_prot_t		r_protection, r_max_protection;
-	    vm_inherit_t	r_inheritance;
-	    boolean_t		r_is_shared;
-	    memory_object_name_t r_object_name;
-	    vm_offset_t		r_offset;
-	    kern_return_t	kr;
-
-	    r_addr = addr;
-
-	    kr = vm_region(my_task,
-			&r_addr,
-			&r_size,
-			&r_protection,
-			&r_max_protection,
-			&r_inheritance,
-			&r_is_shared,
-			&r_object_name,
-			&r_offset);
-	    if ((kr == KERN_SUCCESS) && MACH_PORT_VALID(r_object_name))
-		(void) mach_port_deallocate(my_task, r_object_name);
-	    if ((kr == KERN_SUCCESS) &&
-		(r_addr <= addr) &&
-		((r_protection & (VM_PROT_READ|VM_PROT_WRITE)) ==
-					(VM_PROT_READ|VM_PROT_WRITE)))
-		(void) vm_deallocate(my_task, r_addr, r_size);
-	}
-#endif
-
-	printf ("(serverboot): terminating\n");
-	while (1)
-	  task_terminate (mach_task_self ());
-      /*NOTREACHED*/
-}
-
-/* Parse the boot script.  */
-parse_script (struct file *f)
-{
-  char *p, *line, *buf;
-  int amt, fd, err;
-  int n = 0;
-
-  buf = malloc (f->f_size + 1);	/* add one for null terminator we will write */
-  err = read_file (f, 0, buf, f->f_size, 0);
-  if (err)
-    panic ("bootstrap: error reading boot script file: %s", strerror (err));
-
-  line = p = buf;
-  while (1)
-    {
-      while (p < buf + f->f_size && *p != '\n')
-	p++;
-      *p = '\0';
-      err = boot_script_parse_line (0, line);
-      if (err)
-	boot_panic (err);
-      if (p == buf + f->f_size)
-	break;
-      line = ++p;
-    }
-  free (buf);
-}