Converted 'vmunix' to 'kernel'.

bin/ps/ps.1

@@ -98,7 +98,7 @@ Sort by memory usage, instead of by process
 .Tn ID .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Dq Pa /vmunix .
+.Dq Pa /kernel .
 .It Fl O
 Add the information associated with the space or comma separated list
 of keywords specified, after the process
@@ -475,7 +475,7 @@ wait channel (as a symbolic name)
 exit or stop status (valid only for stopped or zombie process)
 .El
 .Sh FILES
-.Bl -tag -width /var/run/kvm_vmunix.db -compact
+.Bl -tag -width /var/run/kvm_kernel.db -compact
 .It Pa /dev
 special files and device names
 .It Pa /dev/drum
@@ -484,9 +484,9 @@ default swap device
 default kernel memory
 .It Pa /var/run/dev.db
 /dev name database
-.It Pa /var/run/kvm_vmunix.db
+.It Pa /var/run/kvm_kernel.db
 system namelist database
-.It Pa /vmunix
+.It Pa /kernel
 default system namelist
 .El
 .Sh SEE ALSO

lib/libc/sys/reboot.2

@@ -62,7 +62,7 @@ The default, causing the system to reboot in its usual fashion.
 Interpreted by the bootstrap program itself, causing it to
 prompt on the console as to what file should be booted.
 Normally, the system is booted from the file
-.Dq Em xx Ns No (0,0)vmunix ,
+.Dq Em xx Ns No (0,0)kernel ,
 where
 .Em xx
 is the default disk name,
@@ -123,7 +123,7 @@ program in the newly booted system.
 When no options are given (i.e.,
 .Dv RB_AUTOBOOT
 is used), the system is
-rebooted from file ``vmunix'' in the root file system of unit 0
+rebooted from file ``kernel'' in the root file system of unit 0
 of a disk chosen in a processor specific way.
 An automatic consistency check of the disks is normally performed
 (see

lib/libkvm/kvm.c

@@ -226,7 +226,7 @@ _kvm_open(kd, uf, mf, sf, flag, errout)
 		}
 		/*
 		 * Open kvm nlist database.  We go ahead and do this
-		 * here so that we don't have to hold on to the vmunix
+		 * here so that we don't have to hold on to the kernel
 		 * path name.  Since a kvm application will surely do
 		 * a kvm_nlist(), this probably won't be a wasted effort.
 		 * If the database cannot be opened, open the namelist

lib/libkvm/kvm_nlist.3

@@ -71,8 +71,8 @@ The
 function returns the number of invalid entries found.
 If the kernel symbol table was unreadable, -1 is returned.
 .Sh FILES
-.Bl -tag -width /var/db/kvm_vmunix.db -compact
-.It Pa /var/db/kvm_vmunix.db
+.Bl -tag -width /var/db/kvm_kernel.db -compact
+.It Pa /var/db/kvm_kernel.db
 .El
 .Sh SEE ALSO
 .Xr kvm 3 ,

lib/libkvm/kvm_private.h

@@ -51,7 +51,7 @@ struct __kvm {
 	int	pmfd;		/* physical memory file (or crashdump) */
 	int	vmfd;		/* virtual memory file (-1 if crashdump) */
 	int	swfd;		/* swap file (e.g., /dev/drum) */
-	int	nlfd;		/* namelist file (e.g., /vmunix) */
+	int	nlfd;		/* namelist file (e.g., /kernel) */
 	struct kinfo_proc *procbase;
 	char	*argspc;	/* (dynamic) storage for argv strings */
 	int	arglen;		/* length of the above */

sbin/dmesg/dmesg.8

@@ -52,7 +52,7 @@ Extract values associated with the name list from the specified core
 instead of the default ``/dev/kmem''.
 .It Fl N
 Extract the name list from the specified system instead of the default
-``/vmunix''.
+``/kernel''.
 .El
 .Sh SEE ALSO
 .Xr syslogd 8

sbin/reboot/boot_hp300.8

@@ -64,7 +64,7 @@ This
 .Em boot
 program
 finds the corresponding file on the given device 
-.Pf ( Ar vmunix
+.Pf ( Ar kernel
 by default),
 loads that file into memory,
 and starts the program at the entry address specified in the program header.
@@ -94,7 +94,7 @@ specifiers.
 For example,
 to boot from the `a' file system of unit 0 on HP-IB 2,
 type
-.Ql rd(16, 0)vmunix
+.Ql rd(16, 0)kernel
 to the boot prompt.
 For tapes, the minor device number gives a file offset.
 .Pp
@@ -103,7 +103,7 @@ In an emergency, the bootstrap methods described in the paper
 can be used to boot from a distribution tape.
 .Sh FILES
 .Bl -tag -width /usr/mdec/installboot -compact
-.It Pa /vmunix
+.It Pa /kernel
 system code
 .It Pa /usr/mdec/bootrd
 .Tn LIF

sbin/reboot/boot_i386.8

@@ -54,7 +54,7 @@ clones attempt to boot the floppy disk drive A (otherwise known as drive
 0) first, and failing that, attempt to boot the hard disk C (otherwise
 known as hard disk controller 1, drive 0).
 The automatic boot will attempt to load
-.Pa vmunix
+.Pa kernel
 from partition A of either the floppy or the hard disk.
 This boot may be aborted by typing any character on the keyboard repeatedly
 (four or five times at least) during the operating system load phase, after
@@ -99,18 +99,18 @@ fd	5 1/4" or 3 1/2" High density floppies
 For example,
 to boot from a file system which starts at cylinder 0
 of unit 0 of an IDE disk, type
-.Dq Li wd0a:vmunix
+.Dq Li wd0a:kernel
 to the boot prompt;
-.Dq Li fd0a:vmunix
+.Dq Li fd0a:kernel
 would specify a 3 1/2" floppy drive 0 .
 .Pp
 In an emergency, the bootstrap methods described in the paper
 .%T "Installing and Operating 4.3 BSD-Reno UNIX on the AT/386"
 can be used
 to boot from a distribution tape.
 .Sh FILES
-.Bl -tag -width /vmunixxx -compact
-.It Pa /vmunix
+.Bl -tag -width /kernelxx -compact
+.It Pa /kernel
 system code
 .It Pa /boot
 system bootstrap

sbin/reboot/boot_sparc.8

@@ -55,7 +55,7 @@ and unless this fails, the system will resume multi-user operations.
 The SPARC system currently uses the SunOS bootstrap loaders.
 This will be changed in a future version of the system.
 The SunOS boot will attempt to load
-.Pa vmunix
+.Pa kernel
 from partition A of the boot device,
 which must currently be an ``sd'' disk.
 .Pp
@@ -69,8 +69,8 @@ Here it waits for a kernel debugger connect; see
 .Xr kgdb 8 .
 Other flags are currently ignored.
 .Sh FILES
-.Bl -tag -width /vmunixxx -compact
-.It Pa /vmunix
+.Bl -tag -width /kernelxx -compact
+.It Pa /kernel
 system code
 .It Pa /boot
 system bootstrap

sbin/reboot/boot_tahoe.8

@@ -122,9 +122,9 @@ to boot from a file system which starts at cylinder 0
 of unit 0 of an
 .Tn SMD-E
 disk, type
-.Ql dk(0,0)vmunix
+.Ql dk(0,0)kernel
 to the boot prompt;
-.Ql dk(2,1,0)vmunix
+.Ql dk(2,1,0)kernel
 would specify drive 1 on
 .Tn SMD-E
 controller 2.
@@ -134,8 +134,8 @@ In an emergency, the bootstrap methods described in the paper
 can be used
 to boot from a distribution tape.
 .Sh FILES
-.Bl -tag -width /vmunix -compact
-.It Pa /vmunix
+.Bl -tag -width /kernel -compact
+.It Pa /kernel
 system code
 .It Pa /boot
 system bootstrap

sbin/reboot/boot_vax.8

@@ -199,7 +199,7 @@ On any processor, the
 .Em boot
 program
 finds the corresponding file on the given device 
-.Pf ( Pa vmunix
+.Pf ( Pa kernel
 by default), loads that file
 into memory location zero, and starts the program at the entry address
 specified in the program header (after clearing off the high bit
@@ -257,26 +257,26 @@ to boot from a file system which starts at cylinder 0
 of unit 0 of a
 .Tn MASSBUS
 disk, type
-.Ql hp(0,0)vmunix
+.Ql hp(0,0)kernel
 to the boot prompt;
-.Ql hp(2,0,1,0)vmunix
+.Ql hp(2,0,1,0)kernel
 would specify drive 1 on
 .Tn MASSBUS
 adaptor 2;
-.Ql up(0,0)vmunix
+.Ql up(0,0)kernel
 would specify a
 .Tn UNIBUS
 drive,
-.Ql hk(0,0)vmunix
+.Ql hk(0,0)kernel
 would specify
 an RK07 disk drive,
-.Ql ra(1,0,0,0)vmunix
+.Ql ra(1,0,0,0)kernel
 would specify a
 .Tn UDA50
 disk drive on a second
 .Tn UNIBUS ,
 and
-.Ql rb(0,0)vmunix
+.Ql rb(0,0)kernel
 would specify a
 disk on a 730
 .Tn IDC .
@@ -299,7 +299,7 @@ In an emergency, the bootstrap methods described in the paper
 can be used to boot from a distribution tape.
 .Sh FILES
 .Bl -tag -width /usr/mdec/xxboot -compact
-.It Pa /vmunix
+.It Pa /kernel
 system code
 .It Pa /boot
 system bootstrap

sbin/savecore/savecore.8

@@ -63,7 +63,7 @@ is insufficient disk space.
 .It Fl N
 Use
 .Ar system
-as the kernel instead of the default ``/vmunix''.
+as the kernel instead of the default ``/kernel''.
 .It Fl v
 Prints out some additional debugging information.
 .It Fl z
@@ -77,7 +77,7 @@ that it corresponds to the currently running system.
 If it passes these checks, it saves the core image in
 .Ar directory Ns Pa /vmcore.#
 and the system in
-.Ar directory Ns Pa /vmunix.#
+.Ar directory Ns Pa /kernel.#
 The ``#'' is the number from the first line of the file
 .Ar directory Ns Pa /bounds ,
 and it is incremented and stored back into the file each time
@@ -107,8 +107,8 @@ is meant to be called near the end of the initialization file
 (see
 .Xr rc 8 ) .
 .Sh FILES
-.Bl -tag -width /vmunixxx -compact
-.It Pa /vmunix
+.Bl -tag -width /kernelxx -compact
+.It Pa /kernel
 current
 .Tn UNIX
 .El

sbin/savecore/savecore.c

@@ -99,7 +99,7 @@ long	dumplo;				/* where dump starts on dumpdev */
 int	dumpmag;			/* magic number in dump */
 int	dumpsize;			/* amount of memory dumped */
 
-char	*vmunix;
+char	*kernel;
 char	*dirname;			/* directory to save dumps in */
 char	*ddname;			/* name of dump device */
 dev_t	dumpdev;			/* dump device */
@@ -150,7 +150,7 @@ main(argc, argv)
 			force = 1;
 			break;
 		case 'N':
-			vmunix = optarg;
+			kernel = optarg;
 			break;
 		case 'z':
 			compress = 1;
@@ -168,7 +168,7 @@ main(argc, argv)
 		dirname = argv[0];
 	}
 	if (argc == 2)
-		vmunix = argv[1];
+		kernel = argv[1];
 
 	(void)time(&now);
 	kmem_setup();
@@ -221,7 +221,7 @@ kmem_setup()
 			exit(1);
 		}
 
-	dump_sys = vmunix ? vmunix : _PATH_UNIX;
+	dump_sys = kernel ? kernel : _PATH_UNIX;
 	if ((nlist(dump_sys, dump_nl)) == -1)
 		syslog(LOG_ERR, "%s: nlist: %s", dump_sys, strerror(errno));
 	for (i = 0; dumpsyms[i] != -1; i++)
@@ -253,7 +253,7 @@ kmem_setup()
 		syslog(LOG_ERR, "%s: fdopen: %m", _PATH_KMEM);
 		exit(1);
 	}
-	if (vmunix)
+	if (kernel)
 		return;
 	(void)fseek(fp, (off_t)current_nl[X_VERSION].n_value, L_SET);
 	(void)fgets(vers, sizeof(vers), fp);
@@ -275,7 +275,7 @@ check_kmem()
 	}
 	fseek(fp, (off_t)(dumplo + ok(dump_nl[X_VERSION].n_value)), L_SET);
 	fgets(core_vers, sizeof(core_vers), fp);
-	if (strcmp(vers, core_vers) && vmunix == 0)
+	if (strcmp(vers, core_vers) && kernel == 0)
 		syslog(LOG_WARNING,
 		    "warning: %s version mismatch:\n\t%s\nand\t%s\n",
 		    _PATH_UNIX, vers, core_vers);
@@ -413,8 +413,8 @@ err2:			syslog(LOG_WARNING,
 		(void)close(ofd);
 
 	/* Copy the kernel. */
-	ifd = Open(vmunix ? vmunix : _PATH_UNIX, O_RDONLY);
-	(void)snprintf(path, sizeof(path), "%s/vmunix.%d%s",
+	ifd = Open(kernel ? kernel : _PATH_UNIX, O_RDONLY);
+	(void)snprintf(path, sizeof(path), "%s/kernel.%d%s",
 	    dirname, bounds, compress ? ".Z" : "");
 	if (compress) {
 		if ((fp = zopen(path, "w", 0)) == NULL) {
@@ -434,15 +434,15 @@ err2:			syslog(LOG_WARNING,
 			syslog(LOG_ERR, "%s: %s",
 			    path, strerror(nw == 0 ? EIO : errno));
 			syslog(LOG_WARNING,
-			    "WARNING: vmunix may be incomplete");
+			    "WARNING: kernel may be incomplete");
 			exit(1);
 		}
 	}
 	if (nr < 0) {
 		syslog(LOG_ERR, "%s: %s",
-		    vmunix ? vmunix : _PATH_UNIX, strerror(errno));
+		    kernel ? kernel : _PATH_UNIX, strerror(errno));
 		syslog(LOG_WARNING,
-		    "WARNING: vmunix may be incomplete");
+		    "WARNING: kernel may be incomplete");
 		exit(1);
 	}
 	if (compress)
@@ -532,18 +532,18 @@ int
 check_space()
 {
 	register FILE *fp;
-	char *tvmunix;
-	off_t minfree, spacefree, vmunixsize, needed;
+	char *tkernel;
+	off_t minfree, spacefree, kernelsize, needed;
 	struct stat st;
 	struct statfs fsbuf;
 	char buf[100], path[MAXPATHLEN];
 
-	tvmunix = vmunix ? vmunix : _PATH_UNIX;
-	if (stat(tvmunix, &st) < 0) {
-		syslog(LOG_ERR, "%s: %m", tvmunix);
+	tkernel = kernel ? kernel : _PATH_UNIX;
+	if (stat(tkernel, &st) < 0) {
+		syslog(LOG_ERR, "%s: %m", tkernel);
 		exit(1);
 	}
-	vmunixsize = st.st_blocks * S_BLKSIZE;
+	kernelsize = st.st_blocks * S_BLKSIZE;
 	if (statfs(dirname, &fsbuf) < 0) {
 		syslog(LOG_ERR, "%s: %m", dirname);
 		exit(1);
@@ -561,7 +561,7 @@ check_space()
 		(void)fclose(fp);
 	}
 
-	needed = (dumpsize + vmunixsize) / 1024;
+	needed = (dumpsize + kernelsize) / 1024;
  	if (minfree > 0 && spacefree - needed < minfree) {
 		syslog(LOG_WARNING,
 		    "no dump, not enough free space on device");