Subject: The Grand Reorganization Continues (#349 - 6 of 8)
Index:	MANY(mostly etc)/MANY 2.11BSD

Description:
	This is a continuation of the directory reorganization started
	in updates #335 thru 342.

	That series of updates was aimed at cleaning up /usr/lib (and to a
	very small extent /etc).  This series of updates (#344 thru 351)
	(almost) completes the reorganization by dispersing all but the
	config files from /etc into /sbin, /usr/sbin, /usr/libexec, usw.

Repeat-By:
	This is extracted from #335:

	"By observation and/or having to admin a mixture of 2.11BSD systems
	and systems which use the post 1989/90 directory hierarchy.

	Alternatively you may have, over the years, been one of the folks
	who has asked me "when is the directory layout going to be updated to
	reflect current 'standards'?""

Fix:
	This is #349 (part 6 of 8).

	Updates #344 thru #351 comprise the 8 part kit which moves everything
	that is not a config file out of /etc.

	NOTE: All executables in /etc *EXCEPT* /etc/init and /etc/autoconfig
	      are relocated by this update.  Those two programs were left in
	      /etc because:
	      
			/etc/init is known to the kernel - moving 'init'
			without changing the kernel would render the system
			unbootable.  Even if the kernel were updated there
			would be a big problem if an older kernel were to be
			used.

			/etc/autoconfig is known to 'init' and a change to
			'init' at this time (amidst all the other patching)
			was not thought to be a "good idea" at this time.

	The good news is that the update can be done "in place" - it will not
	be necessary to dump and reload the system.  The "bad news" is that
	a "make world" (recompile of the system from sources) is necessary.

	The rebuild is because two pathnames are widely known and/or
	implicitly referenced by *many* programs in the system:

		/etc/zoneinfo is used by the ctime() routine in libc.a and
		there are tens (hundreds?) of programs which call the ctime()
		family of functions.  Because /etc/zoneinfo is moved to 
		/usr/share/zoneinfo any program which references ctime()
		directly or indirectly needs to be relinked.

		The utmp file's pathname /etc/utmp is explicitly referenced
		by many programs in the system and since /etc/utmp is moved
		to /var/run/utmp all programs which read/write the utmp file
		need to be recompiled.

	The manifest is as follows:

	Part    Patch#	Contents
	----	-----	--------
	1	344	Manifest of files.  Introduction/tour.  Instructions. 
			Shell script to perform the relocation of directories.
			Suggested changes to locally modified files in /etc.  
			A 'shar' file containing a new 'whereis' program.

	2	345	Shar archive of all the new Makefiles which are to
			be installed on the system.  This is a separate part
			because it's ~60kb worth of makefiles.
	
	3-8	346-351	Patch files.  Broken into ~64kb pieces.

	As always these, and all previous updates to 2.11BSD, are available
	via anonymous FTP to either FTP.IIPO.GTEGSC.COM or MOE.2BSD.COM in
	the directory /pub/2.11BSD.

-------------------------#349 Cut here-------------------------
*** /usr/src/sbin/dmesg/dmesg.8.old	Sun Dec 14 15:08:41 1986
--- /usr/src/sbin/dmesg/dmesg.8	Sun Nov 17 18:28:02 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)dmesg.8	6.2 (Berkeley) 5/19/86
  .\"
! .TH DMESG 8 "May 19, 1986"
  .UC 4
  .SH NAME
  dmesg \- collect system diagnostic messages to form error log
  .SH SYNOPSIS
! .B /etc/dmesg
  [ \- ]
  .SH DESCRIPTION
  .B N.B.:
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)dmesg.8	6.2.1 (2.11BSD) 1996/11/17
  .\"
! .TH DMESG 8 "November 17, 1996"
  .UC 4
  .SH NAME
  dmesg \- collect system diagnostic messages to form error log
  .SH SYNOPSIS
! .B /sbin/dmesg
  [ \- ]
  .SH DESCRIPTION
  .B N.B.:
*** /usr/src/sbin/dump/Makefile.old	Tue Dec  6 21:35:10 1994
--- /usr/src/sbin/dump/Makefile	Sat Nov 16 20:01:57 1996
***************
*** 1,4 ****
! # sccsid = "@(#)Makefile	1.4 (2.11BSD GTE) 12/6/94"
  #
  #	dump.h			header file
  #	dumpitime.c		reads /etc/ddate
--- 1,4 ----
! # sccsid = "@(#)Makefile	1.5 (2.11BSD GTE) 1996/11/16"
  #
  #	dump.h			header file
  #	dumpitime.c		reads /etc/ddate
***************
*** 35,43 ****
  	cc ${CFLAGS} ${SEPFLAG} dumpdir.c -o dumpdir
  
  install: all
! 	install -s dump ${DESTDIR}/etc/dump
! 	install -s rdump ${DESTDIR}/etc/rdump
! 	install -s dumpdir ${DESTDIR}/etc/dumpdir
  
  clean:
  	rm -f *.o dump rdump dumpdir
--- 35,43 ----
  	cc ${CFLAGS} ${SEPFLAG} dumpdir.c -o dumpdir
  
  install: all
! 	install -s dump ${DESTDIR}/sbin/dump
! 	install -s rdump ${DESTDIR}/sbin/rdump
! 	install -s dumpdir ${DESTDIR}/sbin/dumpdir
  
  clean:
  	rm -f *.o dump rdump dumpdir
*** /usr/src/sbin/dump/dumpoptr.c.old	Thu Dec 15 19:38:56 1994
--- /usr/src/sbin/dump/dumpoptr.c	Sat Nov 16 20:03:59 1996
***************
*** 1,5 ****
  #if	!defined(lint) && defined(DOSCCS)
! static	char *sccsid = "@(#)dumpoptr.c	1.5 (2.11BSD GTE) 12/6/94";
  #endif
  
  #include "dump.h"
--- 1,5 ----
  #if	!defined(lint) && defined(DOSCCS)
! static	char *sccsid = "@(#)dumpoptr.c	1.6 (2.11BSD GTE) 1996/11/16";
  #endif
  
  #include "dump.h"
***************
*** 143,150 ****
  	clock = time((time_t *)0);
  	localclock = localtime(&clock);
  
! 	if((f_utmp = fopen("/etc/utmp", "r")) == NULL) {
! 		msg("Cannot open /etc/utmp\n");
  		return;
  	}
  
--- 143,150 ----
  	clock = time((time_t *)0);
  	localclock = localtime(&clock);
  
! 	if((f_utmp = fopen(_PATH_UTMP, "r")) == NULL) {
! 		msg("Cannot open 'utmp'\n");
  		return;
  	}
  
*** /usr/src/sbin/fsck/Makefile.old	Wed May  8 22:06:07 1996
--- /usr/src/sbin/fsck/Makefile	Sat Nov 30 10:39:38 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.8.1 (2.11BSD) 1996/5/8
  #
  DESTDIR=
  CFLAGS=	-O
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.8.2 (2.11BSD) 1996/11/16
  #
  DESTDIR=
  CFLAGS=	-O
***************
*** 29,34 ****
--- 29,36 ----
  #
  HDRS=	fsck.h
  
+ all:	${PROG}
+ 
  ${PROG}: ${OBJS} ${HDRS} strings.o
  	cc ${LFLAGS} -o ${PROG} ${OBJS} strings.o
  
***************
*** 45,51 ****
  	rm -f xs.c
  
  install: ${PROG}
! 	install -s ${PROG} ${DESTDIR}/etc/${PROG}
  
  clean:
  	rm -f a.out core ${OBJS} ${PROG} strings.o x.c xs.c strings
--- 47,53 ----
  	rm -f xs.c
  
  install: ${PROG}
! 	install -s ${PROG} ${DESTDIR}/sbin/${PROG}
  
  clean:
  	rm -f a.out core ${OBJS} ${PROG} strings.o x.c xs.c strings
*** /usr/src/sbin/ifconfig/ifconfig.8.old	Sun Dec 14 15:08:46 1986
--- /usr/src/sbin/ifconfig/ifconfig.8	Sat Nov 16 22:55:41 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)ifconfig.8c	6.4 (Berkeley) 5/22/86
  .\"
! .TH IFCONFIG 8C "May 22, 1986"
  .UC 5
  .SH NAME
  ifconfig \- configure network interface parameters
  .SH SYOPNSIS
! .B /etc/ifconfig
  interface address_family
  [
  .I address
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)ifconfig.8	6.4.1 (2.11BSD) 1996/11/16
  .\"
! .TH IFCONFIG 8 "November 16, 1996"
  .UC 5
  .SH NAME
  ifconfig \- configure network interface parameters
  .SH SYOPNSIS
! .B /sbin/ifconfig
  interface address_family
  [
  .I address
***************
*** 19,25 ****
  .I parameters
  ]
  .br
! .B /etc/ifconfig
  interface
  [
  protocol_family
--- 19,25 ----
  .I parameters
  ]
  .br
! .B /sbin/ifconfig
  interface
  [
  protocol_family
***************
*** 116,122 ****
  .IR n ,
  default 0.
  The routing metric is used by the routing protocol
! .RI ( routed (8c)).
  Higher metrics have the effect of making a route
  less favorable; metrics are counted as addition hops
  to the destination network or host.
--- 116,122 ----
  .IR n ,
  default 0.
  The routing metric is used by the routing protocol
! .RI ( routed (8)).
  Higher metrics have the effect of making a route
  less favorable; metrics are counted as addition hops
  to the destination network or host.
*** /usr/src/sbin/mkfs/mkfs.8.old	Wed May  8 20:22:10 1996
--- /usr/src/sbin/mkfs/mkfs.8	Sat Nov 16 15:19:50 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mkfs.8	2.1 (2.11BSD) 1996/5/8
  .\"
! .TH MKFS 8 "May 8, 1996"
  .UC 2
  .SH NAME
  mkfs \- construct a file system
  .SH SYNOPSIS
! .B /etc/mkfs
  [
  .B \-i bytes
  ]
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mkfs.8	2.2 (2.11BSD) 1996/11/16
  .\"
! .TH MKFS 8 "November 16, 1996"
  .UC 2
  .SH NAME
  mkfs \- construct a file system
  .SH SYNOPSIS
! .B /sbin/mkfs
  [
  .B \-i bytes
  ]
*** /usr/src/sbin/mknod/mknod.8.old	Sun Dec 14 15:08:42 1986
--- /usr/src/sbin/mknod/mknod.8	Sat Nov 16 16:07:55 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mknod.8	6.2 (Berkeley) 5/19/86
  .\"
! .TH MKNOD 8 "May 19, 1986"
  .UC 4
  .SH NAME
  mknod \- build special file
  .SH SYNOPSIS
! .B /etc/mknod
  name
  [
  .B c
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mknod.8	6.2.1 (2.11BSD) 1996/11/16
  .\"
! .TH MKNOD 8 "November 16, 1996"
  .UC 4
  .SH NAME
  mknod \- build special file
  .SH SYNOPSIS
! .B /sbin/mknod
  name
  [
  .B c
*** /usr/src/sbin/mkpasswd/Makefile.old	Mon Jan 18 08:46:43 1993
--- /usr/src/sbin/mkpasswd/Makefile	Sat Nov 16 20:27:28 1996
***************
*** 14,46 ****
  # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
  # FITNESS FOR A PARTICULAR PURPOSE.
  #
! # @(#)Makefile	5.1 (Berkeley) 10/19/88
  #
  
  CFLAGS=	-O
  SEPFLAG= -i
- LIBC=	/lib/libc.a
  SRCS=	mkpasswd.c
! OBJS=
  MAN=	mkpasswd.0
  MANSRC=	mkpasswd.8
  
! all: mkpasswd
  
! mkpasswd: ${LIBC}
! 	${CC} ${SEPFLAG} -o $@ ${CFLAGS} $@.c
  
  clean:
  	rm -f ${OBJS} ${MAN} core mkpasswd
  
- cleandir: clean
- 	rm -f tags .depend
- 
  depend: ${SRCS}
  	mkdep -p ${CFLAGS} ${SRCS}
  
  install: ${MAN} mkpasswd
! 	install -s -o bin -g bin -m 755 mkpasswd ${DESTDIR}/etc
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
  
  mkpasswd.0: ${MANSRC}
--- 14,42 ----
  # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
  # FITNESS FOR A PARTICULAR PURPOSE.
  #
! # @(#)Makefile	5.1.1 (2.11BSD) 1996/11/16
  #
  
  CFLAGS=	-O
  SEPFLAG= -i
  SRCS=	mkpasswd.c
! OBJS=	mkpasswd.o
  MAN=	mkpasswd.0
  MANSRC=	mkpasswd.8
  
! all: mkpasswd ${MAN}
  
! mkpasswd: ${OBJS}
! 	${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS}
  
  clean:
  	rm -f ${OBJS} ${MAN} core mkpasswd
  
  depend: ${SRCS}
  	mkdep -p ${CFLAGS} ${SRCS}
  
  install: ${MAN} mkpasswd
! 	install -s -o bin -g bin -m 755 mkpasswd ${DESTDIR}/sbin/mkpasswd
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
  
  mkpasswd.0: ${MANSRC}
*** /usr/src/sbin/mount/Makefile.old	Mon Jan 15 21:41:23 1996
--- /usr/src/sbin/mount/Makefile	Sat Nov 16 20:34:50 1996
***************
*** 1,7 ****
  #
  # Public Domain.  1996/1/15 - Steven Schultz
  #
! #	@(#)Makefile	1.0 (2.11BSD GTE) 1996/1/15
  #
  CFLAGS=	 -O
  SEPFLAG= -i
--- 1,7 ----
  #
  # Public Domain.  1996/1/15 - Steven Schultz
  #
! #	@(#)Makefile	1.1 (2.11BSD GTE) 1996/11/16
  #
  CFLAGS=	 -O
  SEPFLAG= -i
***************
*** 29,35 ****
  
  install: all
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
! 	install -s -o root -g bin -m 755 mount ${DESTDIR}/etc/mount
  
  lint: ${SRCS}
  	lint -hax ${SRCS}
--- 29,35 ----
  
  install: all
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
! 	install -s -o root -g bin -m 755 mount ${DESTDIR}/sbin/mount
  
  lint: ${SRCS}
  	lint -hax ${SRCS}
*** /usr/src/sbin/mount/mount.8.old	Thu Apr 18 21:48:08 1996
--- /usr/src/sbin/mount/mount.8	Sat Nov 16 20:34:12 1996
***************
*** 29,37 ****
  .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  .\" SUCH DAMAGE.
  .\"
! .\"     @(#)mount.8	8.7.2 (2.11BSD) 1996/4/18
  .\"
! .TH MOUNT 8 "January 16, 1996"
  .UC 7
  .SH NAME
  \fBmount\fP \- mount file systems
--- 29,37 ----
  .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  .\" SUCH DAMAGE.
  .\"
! .\"     @(#)mount.8	8.7.3 (2.11BSD) 1996/11/16
  .\"
! .TH MOUNT 8 "November 16, 1996"
  .UC 7
  .SH NAME
  \fBmount\fP \- mount file systems
***************
*** 201,207 ****
  .sp
  If the type is not one of the internally known types,
  mount will attempt to execute a program in
! .I /etc/mount_XXX
  where
  .I XXX
  is replaced by the type name.
--- 201,207 ----
  .sp
  If the type is not one of the internally known types,
  mount will attempt to execute a program in
! .I /sbin/mount_XXX
  where
  .I XXX
  is replaced by the type name.
*** /usr/src/sbin/mount/mount.c.old	Sat Apr 20 21:51:26 1996
--- /usr/src/sbin/mount/mount.c	Sat Nov 16 20:34:31 1996
***************
*** 36,42 ****
  "@(#) Copyright (c) 1980, 1989, 1993, 1994\n\
  	The Regents of the University of California.  All rights reserved.\n";
  
! static char sccsid[] = "@(#)mount.c	8.19.2 (2.11BSD) 1996/4/18";
  #endif /* not lint */
  
  #include <sys/param.h>
--- 36,42 ----
  "@(#) Copyright (c) 1980, 1989, 1993, 1994\n\
  	The Regents of the University of California.  All rights reserved.\n";
  
! static char sccsid[] = "@(#)mount.c	8.19.3 (2.11BSD) 1996/11/16";
  #endif /* not lint */
  
  #include <sys/param.h>
***************
*** 238,245 ****
  {
  	/* List of directories containing mount_xxx subcommands. */
  	static char *edirs[] = {
! 		_PATH_ETC,
! 		_PATH_BIN,
  		NULL
  	};
  	char *argv[100], **edir;
--- 238,245 ----
  {
  	/* List of directories containing mount_xxx subcommands. */
  	static char *edirs[] = {
! 		_PATH_SBIN,
! 		_PATH_USRSBIN,
  		NULL
  	};
  	char *argv[100], **edir;
*** /usr/src/sbin/mount/pathnames.h.old	Mon Jan 15 21:42:40 1996
--- /usr/src/sbin/mount/pathnames.h	Sat Nov 16 20:31:51 1996
***************
*** 30,37 ****
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   *
!  *	@(#)pathnames.h	8.2.1 (2.11BSD) 1996/1/15
   */
  
! #define _PATH_ETC	"/etc"
! #define _PATH_BIN	"/bin"
--- 30,37 ----
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   *
!  *	@(#)pathnames.h	8.2.2 (2.11BSD) 1996/11/16
   */
  
! #define _PATH_SBIN	"/sbin"
! #define	_PATH_USRSBIN	"/usr/sbin"
*** /usr/src/sbin/newfs/newfs.8.old	Fri Apr 12 23:24:58 1996
--- /usr/src/sbin/newfs/newfs.8	Sat Nov 16 20:42:45 1996
***************
*** 9,15 ****
  .SH NAME
  newfs \- construct a new file system
  .SH SYNOPSIS
! .B /etc/newfs
  [
  .B \-N
  ]
--- 9,15 ----
  .SH NAME
  newfs \- construct a new file system
  .SH SYNOPSIS
! .B /sbin/newfs
  [
  .B \-N
  ]
***************
*** 94,100 ****
  .SH FILES
  /etc/disktab	disk geometry and partition information 
  .br
! /etc/mkfs	to actually build the file system
  .SH "SEE ALSO"
  getdisklabel(3), disklabel(8), disktab(5), diskpart(8), fs(5), fsck(8),
  mkfs(8)
--- 94,100 ----
  .SH FILES
  /etc/disktab	disk geometry and partition information 
  .br
! mkfs	to actually build the file system
  .SH "SEE ALSO"
  getdisklabel(3), disklabel(8), disktab(5), diskpart(8), fs(5), fsck(8),
  mkfs(8)
*** /usr/src/sbin/newfs/newfs.c.old	Fri Apr 12 20:49:00 1996
--- /usr/src/sbin/newfs/newfs.c	Sat Nov 16 20:42:15 1996
***************
*** 11,17 ****
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)newfs.c	6.2 (2.11BSD) 1996/4/12";
  #endif
  
  /*
--- 11,17 ----
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)newfs.c	6.3 (2.11BSD) 1996/11/16";
  #endif
  
  /*
***************
*** 181,187 ****
  	if	(f_n == 0)	/* If never specified then 1/2 the cyl size */
  		f_n = lp->d_secpercyl / logsec;
  
! 	sprintf(cmd, "/etc/mkfs -m %d -n %d -i %u -s %ld %s", f_m, f_n, f_i,
  		fssize, special);
  	printf("newfs: %s\n", cmd);
  
--- 181,187 ----
  	if	(f_n == 0)	/* If never specified then 1/2 the cyl size */
  		f_n = lp->d_secpercyl / logsec;
  
! 	sprintf(cmd, "/sbin/mkfs -m %d -n %d -i %u -s %ld %s", f_m, f_n, f_i,
  		fssize, special);
  	printf("newfs: %s\n", cmd);
  
*** /usr/src/sbin/quotacheck/Makefile.old	Wed Jan 24 23:21:50 1996
--- /usr/src/sbin/quotacheck/Makefile	Sat Nov 16 15:25:06 1996
***************
*** 1,7 ****
  #
  # Public Domain.  1996/1/23 - Steven Schultz
  #
! #	@(#)Makefile	1.0 (2.11BSD GTE) 1996/1/23
  #
  CFLAGS=	 -O
  SEPFLAG= -i
--- 1,7 ----
  #
  # Public Domain.  1996/1/23 - Steven Schultz
  #
! #	@(#)Makefile	1.1 (2.11BSD GTE) 1996/11/16
  #
  CFLAGS=	 -O
  SEPFLAG= -i
***************
*** 26,32 ****
  
  install: all
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
! 	install -s -o root -g bin -m 755 quotacheck ${DESTDIR}/etc/quotacheck
  
  lint: ${SRCS}
  	lint -hax ${SRCS}
--- 26,32 ----
  
  install: all
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
! 	install -s -o root -g bin -m 755 quotacheck ${DESTDIR}/sbin/quotacheck
  
  lint: ${SRCS}
  	lint -hax ${SRCS}
*** /usr/src/sbin/reboot/reboot.8.old	Fri May 24 19:35:11 1996
--- /usr/src/sbin/reboot/reboot.8	Sat Nov 16 18:56:24 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)reboot.8	2.1 (2.11BSD) 1996/5/24
  .\"
  .TH REBOOT 8 "May 24, 1996"
  .UC 2
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)reboot.8	2.2 (2.11BSD) 1996/11/16
  .\"
  .TH REBOOT 8 "May 24, 1996"
  .UC 2
***************
*** 9,25 ****
  .SH NAME
  reboot \- stopping and restarting the system
  .SH SYNOPSIS
! .B /etc/reboot
  [
  .B \-lqnhdarsfRD
  ]
  .br
! .B /etc/halt
  [
  .B \-lqndars
  ]
  .br
! .B /etc/fastboot
  [
  .B \-lqndarsRD
  ]
--- 9,25 ----
  .SH NAME
  reboot \- stopping and restarting the system
  .SH SYNOPSIS
! .B /sbin/reboot
  [
  .B \-lqnhdarsfRD
  ]
  .br
! .B /sbin/halt
  [
  .B \-lqndars
  ]
  .br
! .B /sbin/fastboot
  [
  .B \-lqndarsRD
  ]
***************
*** 33,39 ****
  .IR shutdown (8)
  is normally used to stop time sharing and put the system into single user
  mode.  If there are no users then
! .B /etc/reboot
  can be used without shutting the system down first.
  .PP
  Reboot normally causes the disks to be synced and allows the system to
--- 33,39 ----
  .IR shutdown (8)
  is normally used to stop time sharing and put the system into single user
  mode.  If there are no users then
! .B /sbin/reboot
  can be used without shutting the system down first.
  .PP
  Reboot normally causes the disks to be synced and allows the system to
*** /usr/src/sbin/restor/restor.8.old	Thu May 17 11:13:54 1990
--- /usr/src/sbin/restor/restor.8	Sun Nov 17 20:36:31 1996
***************
*** 95,101 ****
  or to restore an incremental dump tape onto this.
  Thus
  .PP
! 	/etc/mkfs /dev/hp0a 4807
  .br
  	restor r /dev/hp0a
  .PP
--- 95,101 ----
  or to restore an incremental dump tape onto this.
  Thus
  .PP
! 	mkfs /dev/hp0a 4807
  .br
  	restor r /dev/hp0a
  .PP
*** /usr/src/sbin/route/route.8.old	Sun Dec 14 15:08:47 1986
--- /usr/src/sbin/route/route.8	Sat Nov 16 15:14:19 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)route.8c	6.2 (Berkeley) 5/24/86
  .\"
! .TH ROUTE 8C "May 24, 1986"
  .UC 5
  .SH NAME
  route \- manually manipulate the routing tables
  .SH SYNOPSIS
! .B /etc/route
  [
  .B \-f
  ] [
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)route.8	6.2.1 (2.11BSD) 1996/11/16
  .\"
! .TH ROUTE 8 "November 16, 1996"
  .UC 5
  .SH NAME
  route \- manually manipulate the routing tables
  .SH SYNOPSIS
! .B /sbin/route
  [
  .B \-f
  ] [
***************
*** 22,28 ****
  is a program used to manually manipulate the network
  routing tables.  It normally is not needed, as the
  system routing table management daemon,
! .IR routed (8C),
  should tend to this task.
  .PP
  .I Route
--- 22,28 ----
  is a program used to manually manipulate the network
  routing tables.  It normally is not needed, as the
  system routing table management daemon,
! .IR routed (8),
  should tend to this task.
  .PP
  .I Route
***************
*** 35,41 ****
  All commands have the following syntax:
  .PP
  .ti +0.25i
! .B /etc/route 
  .I command
  [
  .B net
--- 35,41 ----
  All commands have the following syntax:
  .PP
  .ti +0.25i
! .B /sbin/route 
  .I command
  [
  .B net
***************
*** 152,156 ****
  to create the new entry.
  .SH "SEE ALSO"
  intro(4N),
! routed(8C),
! XNSrouted(8C)
--- 152,156 ----
  to create the new entry.
  .SH "SEE ALSO"
  intro(4N),
! routed(8),
! XNSrouted(8)
*** /usr/src/sbin/routed/Makefile.old	Tue Aug 30 22:58:25 1988
--- /usr/src/sbin/routed/Makefile	Tue Nov 19 21:30:24 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.2 (Berkeley) 2/7/86
  #
  ALL=	routed
  OBJS=	af.o if.o input.o main.o output.o startup.o tables.o timer.o \
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.2.1 (2.11BSD) 1996/11/19
  #
  ALL=	routed
  OBJS=	af.o if.o input.o main.o output.o startup.o tables.o timer.o \
***************
*** 21,27 ****
  	${CC} ${SEPFLAG} -o routed ${LDFLAGS} ${OBJS}
  
  install: routed
! 	install -s routed ${DESTDIR}/etc
  
  # The following can be deleted where not appropriate to use the kernel's
  # inline code expansions.
--- 21,27 ----
  	${CC} ${SEPFLAG} -o routed ${LDFLAGS} ${OBJS}
  
  install: routed
! 	install -s routed ${DESTDIR}/sbin
  
  # The following can be deleted where not appropriate to use the kernel's
  # inline code expansions.
*** /usr/src/sbin/routed/startup.c.old	Tue Aug 30 22:58:25 1988
--- /usr/src/sbin/routed/startup.c	Tue Nov 19 21:31:18 1996
***************
*** 4,11 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
! static char sccsid[] = "@(#)startup.c	5.7 (Berkeley) 6/3/86";
  #endif not lint
  
  /*
--- 4,11 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)startup.c	5.7.1 (2.11BSD) 1996/11/19";
  #endif not lint
  
  /*
***************
*** 149,155 ****
  bad:
  	sleep(60);
  	close(kmem), close(s);
! 	execv("/etc/routed", argv0);
  	_exit(0177);
  }
  
--- 149,155 ----
  bad:
  	sleep(60);
  	close(kmem), close(s);
! 	execv("/sbin/routed", argv0);
  	_exit(0177);
  }
  
*** /usr/src/sbin/shutdown/shutdown.8.old	Sun Dec 14 15:08:43 1986
--- /usr/src/sbin/shutdown/shutdown.8	Sun Nov 17 21:05:08 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)shutdown.8	6.4 (Berkeley) 5/26/86
  .\"
! .TH SHUTDOWN 8 "May 26, 1986"
  .UC 4
  .SH NAME
  shutdown \- close down the system at a given time
  .SH SYNOPSIS
! .B /etc/shutdown
  [
  .B \-k
  ] [
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)shutdown.8	6.4.1 (2.11BSD) 1996/11/16
  .\"
! .TH SHUTDOWN 8 "November 16, 1996"
  .UC 4
  .SH NAME
  shutdown \- close down the system at a given time
  .SH SYNOPSIS
! .B shutdown
  [
  .B \-k
  ] [
*** /usr/src/sbin/shutdown/shutdown.c.old	Fri Dec 31 22:27:51 1993
--- /usr/src/sbin/shutdown/shutdown.c	Wed Nov 27 21:19:45 1996
***************
*** 9,15 ****
  "@(#) Copyright (c) 1983,1986 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)shutdown.c	5.6.1 (2.11BSD GTE) 12/31/93";
  #endif
  
  #include <stdio.h>
--- 9,15 ----
  "@(#) Copyright (c) 1983,1986 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)shutdown.c	5.6.2 (2.11BSD GTE) 1996/11/16";
  #endif
  
  #include <stdio.h>
***************
*** 18,23 ****
--- 18,24 ----
  #include <setjmp.h>
  #include <utmp.h>
  #include <pwd.h>
+ #include <paths.h>
  #include <sys/time.h>
  #include <sys/resource.h>
  #include <sys/param.h>
***************
*** 24,39 ****
  #include <sys/syslog.h>
  
  /*
!  *	/etc/shutdown when [messages]
   *
   *	allow super users to tell users and remind users
!  *	of iminent shutdown of unix
   *	and shut it down automatically
   *	and even reboot or halt the machine if they desire
   */
  
! #define	REBOOT	"/etc/reboot"
! #define	HALT	"/etc/halt"
  #define MAXINTS 20
  #define	HOURS	*3600
  #define MINUTES	*60
--- 25,40 ----
  #include <sys/syslog.h>
  
  /*
!  *	shutdown when [messages]
   *
   *	allow super users to tell users and remind users
!  *	of imminent shutdown of unix
   *	and shut it down automatically
   *	and even reboot or halt the machine if they desire
   */
  
! #define	REBOOT	"/sbin/reboot"
! #define	HALT	"/sbin/halt"
  #define MAXINTS 20
  #define	HOURS	*3600
  #define MINUTES	*60
***************
*** 74,80 ****
  char	nologin[] = "nologin";
  char    fastboot[] = "fastboot";
  #else
! char	nologin[] = "/etc/nologin";
  char	fastboot[] = "/fastboot";
  #endif
  time_t	nowtime;
--- 75,81 ----
  char	nologin[] = "nologin";
  char    fastboot[] = "fastboot";
  #else
! char	nologin[] = _PATH_NOLOGIN;
  char	fastboot[] = "/fastboot";
  #endif
  time_t	nowtime;
***************
*** 193,202 ****
  #endif
  	sint = 1 HOURS;
  	f = "";
! 	ufd = open("/etc/utmp",0);
  	if (ufd < 0) {
! 		perror("shutdown: /etc/utmp");
! 		exit(1);
  	}
  	first = 1;
  	for (;;) {
--- 194,203 ----
  #endif
  	sint = 1 HOURS;
  	f = "";
! 	ufd = open(_PATH_UTMP,0);
  	if (ufd < 0) {
! 		err(1, "%s", _PATH_UTMP);
! 		/* NOTREACHED */
  	}
  	first = 1;
  	for (;;) {
*** /usr/src/sbin/slattach/slattach.8.old	Sun Dec 14 15:08:39 1986
--- /usr/src/sbin/slattach/slattach.8	Sun Nov 17 21:13:41 1996
***************
*** 1,10 ****
! .\"	@(#)slattach.8c	6.1 (Berkeley) 2/17/86
! .TH SLATTACH 8C "February 17, 1986"
  .UC 6
  .SH NAME
  slattach \- attach serial lines as network interfaces
  .SH SYOPNSIS
! .B /etc/slattach
  ttyname [
  .I baudrate
  ]
--- 1,10 ----
! .\"	@(#)slattach.8	6.1.1 (2.11BSD) 1996/11/17
! .TH SLATTACH 8 "November 17, 1996"
  .UC 6
  .SH NAME
  slattach \- attach serial lines as network interfaces
  .SH SYOPNSIS
! .B slattach
  ttyname [
  .I baudrate
  ]
***************
*** 31,42 ****
  .B netstat(1)
  .SH EXAMPLES
  .ta 8
! 	/etc/slattach ttyh8
  .br
! 	/etc/slattach /dev/tty01 4800
  .SH DIAGNOSTICS
  Messages indicating the specified interface does not exit, the
  requested address is unknown, the user is not privileged and
  tried to alter an interface's configuration.
  .SH "SEE ALSO"
! rc(8), intro(4N), netstat(1), ifconfig(8C)
--- 31,42 ----
  .B netstat(1)
  .SH EXAMPLES
  .ta 8
! 	slattach ttyh8
  .br
! 	slattach /dev/tty01 4800
  .SH DIAGNOSTICS
  Messages indicating the specified interface does not exit, the
  requested address is unknown, the user is not privileged and
  tried to alter an interface's configuration.
  .SH "SEE ALSO"
! rc(8), intro(4), netstat(1), ifconfig(8)
*** /usr/src/sbin/swapon/swapon.8.old	Sun Dec 14 15:08:44 1986
--- /usr/src/sbin/swapon/swapon.8	Sun Nov 17 21:21:52 1996
***************
*** 2,18 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)swapon.8	6.1 (Berkeley) 4/27/85
  .\"
! .TH SWAPON 8 "April 27, 1985"
  .UC 4
  .SH NAME
  swapon \- specify additional device for paging and swapping
  .SH SYNOPSIS
! .B "/etc/swapon"
  .B \-a
  .br
! .B "/etc/swapon"
  name ...
  .SH DESCRIPTION
  .I Swapon
--- 2,18 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)swapon.8	6.1.1 (2.11BSD) 1996/11/17
  .\"
! .TH SWAPON 8 "November 17, 1996"
  .UC 4
  .SH NAME
  swapon \- specify additional device for paging and swapping
  .SH SYNOPSIS
! .B swapon
  .B \-a
  .br
! .B swapon
  name ...
  .SH DESCRIPTION
  .I Swapon
***************
*** 46,48 ****
--- 46,51 ----
  There is no way to stop paging and swapping on a device.
  It is therefore not possible to make use of devices which may be
  dismounted during system operation.
+ .PP
+ .B swapon
+ is not implemented in 2.11BSD.
*** /usr/src/sbin/tunefs/tunefs.8.old	Sun Dec 14 15:08:48 1986
--- /usr/src/sbin/tunefs/tunefs.8	Sun Nov 17 21:36:05 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tunefs.8	6.4 (Berkeley) 5/22/86
  .\"
! .TH TUNEFS 8 "May 22, 1986"
  .UC 5
  .SH NAME
  tunefs \- tune up an existing file system
  .SH SYNOPSIS
! .B /etc/tunefs
  .I tuneup-options
  .IR special | filesys
  .SH DESCRIPTION
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tunefs.8	6.4.1 (2.11BSD) 1996/11/17
  .\"
! .TH TUNEFS 8 "November 17, 1996"
  .UC 5
  .SH NAME
  tunefs \- tune up an existing file system
  .SH SYNOPSIS
! .B tunefs
  .I tuneup-options
  .IR special | filesys
  .SH DESCRIPTION
***************
*** 88,92 ****
--- 88,95 ----
  is run on dismounted file systems.
  To change the root file system, the system must be rebooted
  after the file system is tuned.
+ .PP
+ .B tunefs
+ is not currently implemented in 2.11BSD.
  .PP
  You can tune a file system, but you can't tune a fish.
*** /usr/src/sbin/umount/Makefile.old	Mon Jan 15 21:37:35 1996
--- /usr/src/sbin/umount/Makefile	Sat Nov 16 21:54:39 1996
***************
*** 1,7 ****
  #
  # Public Domain.  1996/1/15 - Steven Schultz
  #
! #	@(#)Makefile	1.0 (2.11BSD GTE) 1996/1/15
  #
  CFLAGS=	 -O
  SEPFLAG= -i
--- 1,7 ----
  #
  # Public Domain.  1996/1/15 - Steven Schultz
  #
! #	@(#)Makefile	1.1 (2.11BSD GTE) 1996/11/16
  #
  CFLAGS=	 -O
  SEPFLAG= -i
***************
*** 26,32 ****
  
  install: all
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
! 	install -s -o root -g bin -m 755 umount ${DESTDIR}/etc/umount
  
  lint: ${SRCS}
  	lint -hax ${SRCS}
--- 26,32 ----
  
  install: all
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
! 	install -s -o root -g bin -m 755 umount ${DESTDIR}/sbin/umount
  
  lint: ${SRCS}
  	lint -hax ${SRCS}
*** /usr/src/share/Makefile.old	Thu Oct 31 21:39:24 1996
--- /usr/src/share/Makefile	Fri Nov 29 20:19:22 1996
***************
*** 1,13 ****
  #
  # Public domain - 1996/10/21 - sms
  #
! #	@(#)Makefile	1.0 (2.11BSD) 1996/10/22
  #
  DESTDIR=
  CFLAGS=	-O
  SEPFLAG= -i
  
! SUBDIR=	adb font fontinfo learn me misc ms tmac termcap lint
  
  all:	${SUBDIR}
  
--- 1,13 ----
  #
  # Public domain - 1996/10/21 - sms
  #
! #	@(#)Makefile	1.1 (2.11BSD) 1996/11/29
  #
  DESTDIR=
  CFLAGS=	-O
  SEPFLAG= -i
  
! SUBDIR=	adb font fontinfo learn me misc ms tmac termcap lint zoneinfo
  
  all:	${SUBDIR}
  
*** /usr/src/share/misc/Makefile.old	Thu Oct 31 20:55:42 1996
--- /usr/src/share/misc/Makefile	Sat Nov 16 19:16:56 1996
***************
*** 1,13 ****
  #
  # Public domain - 1996/10/21 - sms
  #
! #	@(#)Makefile	1.1 (2.11BSD) 1996/10/31
  #
  #  Makefile for misc data files (lib.b from 'bc', usw.)
  #
  
  SRCS= eign lib.b Mail.help Mail.tildehelp units gprof.callg gprof.flat \
! 	vlpmacs
  
  all:	${SRCS}
  
--- 1,13 ----
  #
  # Public domain - 1996/10/21 - sms
  #
! #	@(#)Makefile	1.2 (2.11BSD) 1996/11/16
  #
  #  Makefile for misc data files (lib.b from 'bc', usw.)
  #
  
  SRCS= eign lib.b Mail.help Mail.tildehelp units gprof.callg gprof.flat \
! 	vlpmacs mkproto.data
  
  all:	${SRCS}
  
*** /usr/src/share/misc/mkproto.data.old	Wed May 16 20:20:13 1990
--- /usr/src/share/misc/mkproto.data	Sat Nov 16 19:57:18 1996
***************
*** 24,37 ****
  	$
  etc	d--755 0 10
  	init	---755 0 10 /etc/init
! 	mknod	---755 0 10 /etc/mknod
! 	restor	---755 0 10 /etc/restor
! 	mkfs	---755 0 10 /etc/mkfs
! 	fsck	---755 0 10 /etc/fsck
! 	icheck	---755 0 10 /etc/icheck
! 	ncheck	---755 0 10 /etc/ncheck
! 	dcheck	---755 0 10 /etc/dcheck
! 	dump	---755 0 10 /etc/dump
  	$
  tmp	d--777 0 10
  	$
--- 24,39 ----
  	$
  etc	d--755 0 10
  	init	---755 0 10 /etc/init
! 	$
! sbin	d--755 0 10
! 	mknod	---755 0 10 /sbin/mknod
! 	restor	---755 0 10 /sbin/restor
! 	mkfs	---755 0 10 /sbin/mkfs
! 	fsck	---755 0 10 /sbin/fsck
! 	icheck	---755 0 10 /sbin/icheck
! 	ncheck	---755 0 10 /sbin/ncheck
! 	dcheck	---755 0 10 /sbin/dcheck
! 	dump	---755 0 10 /sbin/dump
  	$
  tmp	d--777 0 10
  	$
*** /usr/src/share/termcap/Makefile.old	Mon Oct 21 21:19:57 1996
--- /usr/src/share/termcap/Makefile	Sun Dec  1 16:56:15 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.2.2 (2.11BSD GTE) 1996/10/21
  #
  # reorder gives an editor command for most common terminals
  # (in reverse order from n'th to 1'st most commonly used)
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.2.3 (2.11BSD GTE) 1996/12/1
  #
  # reorder gives an editor command for most common terminals
  # (in reverse order from n'th to 1'st most commonly used)
***************
*** 14,23 ****
  termcap: reorder termcap.src
  	ex - termcap.src < reorder
  
! install: termcap tabset
! 	install -m 444 termcap ${DESTDIR}/usr/share/misc/termcap
  	rm -f ${DESTDIR}/etc/termcap
  	ln -s /usr/share/misc/termcap ${DESTDIR}/etc/termcap
  
  tabset: FRC
  	rm -fr ${DESTDIR}/usr/share/tabset
--- 14,24 ----
  termcap: reorder termcap.src
  	ex - termcap.src < reorder
  
! install: termcap tabset map3270
! 	install -c -m 444 termcap ${DESTDIR}/usr/share/misc/termcap
  	rm -f ${DESTDIR}/etc/termcap
  	ln -s /usr/share/misc/termcap ${DESTDIR}/etc/termcap
+ 	install -c -m 444 map3270 /usr/share/misc/map3270
  
  tabset: FRC
  	rm -fr ${DESTDIR}/usr/share/tabset
*** /usr/src/share/termcap/map3270.old	Sat Jul 30 19:43:54 1988
--- /usr/src/share/termcap/map3270	Sun Dec  1 16:54:29 1996
***************
*** 1,4 ****
! # /etc/map3270 (/usr/new/etc/map3270 before migration)
  # mail corrections and additions to "termcap"
  #
  # this file contains mappings between characters entered from the keyboard,
--- 1,4 ----
! # /usr/share/misc/map3270
  # mail corrections and additions to "termcap"
  #
  # this file contains mappings between characters entered from the keyboard,
*** /usr/src/share/zoneinfo/Makefile.old	Sun Oct 27 21:56:06 1996
--- /usr/src/share/zoneinfo/Makefile	Sun Dec  1 16:39:14 1996
***************
*** 1,12 ****
! # @(#)Makefile	1.3 Makefile 1996/10/27
  
  DESTDIR=
  
! # If you want something other than Eastern United States time used on your
  # system, change the line below (after finding the zone you want in the
  # time zone files, or adding it to a time zone file).
  # Alternately, if you discover you've got the wrong time zone, you can just
! #	zic -l rightzone
  
  LOCALTIME=	US/Pacific
  
--- 1,12 ----
! # @(#)Makefile	1.4 Makefile 1996/12/1
  
  DESTDIR=
  
! # If you want something other than Western United States time used on your
  # system, change the line below (after finding the zone you want in the
  # time zone files, or adding it to a time zone file).
  # Alternately, if you discover you've got the wrong time zone, you can just
! #	install -c -m 444 /usr/share/zoneinfo/right_zone /etc/localtime
  
  LOCALTIME=	US/Pacific
  
***************
*** 20,37 ****
  
  CFLAGS= -O
  SEPFLAG=-i
! 
! # LINTFLAGS is set for 4.[123]BSD systems.
! # If you're using System V, you'll want to comment out the "LINTFLAGS=" line.
! 
! LINTFLAGS=	-phbaaxc
! 
! # BUNDLE was set to "bundle" in the original, "shar" is more universal
! 
! BUNDLE=		shar
! 
! ################################################################################
! 
  CC=		cc
  
  TZCSRCS=	zic.c scheck.c ialloc.c
--- 20,26 ----
  
  CFLAGS= -O
  SEPFLAG=-i
! LINTFLAGS=	-phbaxc
  CC=		cc
  
  TZCSRCS=	zic.c scheck.c ialloc.c
***************
*** 38,48 ****
  TZCOBJS=	zic.o scheck.o ialloc.o
  TZDSRCS=	zdump.c ialloc.c
  TZDOBJS=	zdump.o ialloc.o
- DOCS=		Theory README Makefile newctime.3 tzfile.5 zic.8 zdump.8
  SOURCES=	zic.c zdump.c scheck.c ialloc.c
  DATA=		asia australasia europe etcetera northamerica \
  		pacificnew systemv
- ENCHILADA=	$(DOCS) $(SOURCES) $(DATA)
  ZICMAN=		zic.0
  ZICMANSRC=	zic.8
  ZDUMAN=		zdump.0
--- 27,35 ----
***************
*** 49,61 ****
  ZDUMANSRC=	zdump.8
  MAN=		$(ZICMAN) $(ZDUMAN)
  MANSRC=		$(ZICMANSRC) $(ZDUMAN)
  
  all:		zdump zic ${ZICMAN} ${ZDUMAN}
  
  install:	zic $(DATA) $(MAN)
! 		./zic -d ${DESTDIR}/etc/zoneinfo -l $(LOCALTIME) $(DATA)
! 		install -c -m 444 -o bin -g bin $(ZICMAN) ${DESTDIR}/usr/man/cat8
! 		install -c -m 444 -o bin -g bin $(ZICMAN) ${DESTDIR}/usr/man/cat8
  		install -c -s -m 755 -o bin -g bin zic ${DESTDIR}/usr/sbin/zic
  
  zdump.0:	$(ZDUMANSRC)
--- 36,51 ----
  ZDUMANSRC=	zdump.8
  MAN=		$(ZICMAN) $(ZDUMAN)
  MANSRC=		$(ZICMANSRC) $(ZDUMAN)
+ SHARDIR=	${DESTDIR}/usr/share/zoneinfo
+ MANDIR=		${DESTDIR}/usr/man/cat8
  
  all:		zdump zic ${ZICMAN} ${ZDUMAN}
  
  install:	zic $(DATA) $(MAN)
! 		./zic -d ${SHARDIR} $(DATA)
! 		install -c -m 444 -o bin -g bin ${SHARDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime
! 		install -c -m 444 -o bin -g bin $(ZICMAN) ${MANDIR}/${ZICMAN}
! 		install -c -m 444 -o bin -g bin $(ZDUMAN) ${MANDIR}/${ZDUMAN}
  		install -c -s -m 755 -o bin -g bin zic ${DESTDIR}/usr/sbin/zic
  
  zdump.0:	$(ZDUMANSRC)
***************
*** 70,100 ****
  zic:		$(TZCOBJS)
  		$(CC) $(CFLAGS) $(LFLAGS) $(SEPFLAG) $(TZCOBJS) -o $@
  
! BUNDLES:	BUNDLE1 BUNDLE2 BUNDLE3
! 
! BUNDLE1:	$(DOCS)
! 		$(BUNDLE) $(DOCS) > $@
! 
! BUNDLE2:	$(SOURCES)
! 		$(BUNDLE) $(SOURCES) > $@
! 
! BUNDLE3:	$(DATA)
! 		$(BUNDLE) $(DATA) > $@
! 
! $(ENCHILADA):
! 		sccs get $(REL) $(REV) $@
! 
! sure:		$(TZCSRCS) $(TZDSRCS)
  		lint $(LINTFLAGS) $(CFLAGS) $(TZCSRCS)
  		lint $(LINTFLAGS) $(CFLAGS) $(TZDSRCS)
  
  clean:
! 		rm -f core *.o *.out REDID_BINARIES zdump zic BUNDLE* \#*
! 		rm -f $(ZICMAN) $(ZDUMAN)
! 
! CLEAN:		clean
! 		sccs clean
! 
! listing:	$(ENCHILADA)
! 		pr $(ENCHILADA) | lpr
! 
--- 60,68 ----
  zic:		$(TZCOBJS)
  		$(CC) $(CFLAGS) $(LFLAGS) $(SEPFLAG) $(TZCOBJS) -o $@
  
! lint:		$(TZCSRCS) $(TZDSRCS)
  		lint $(LINTFLAGS) $(CFLAGS) $(TZCSRCS)
  		lint $(LINTFLAGS) $(CFLAGS) $(TZDSRCS)
  
  clean:
! 		rm -f *.o zdump zic $(ZICMAN) $(ZDUMAN)
*** /usr/src/share/zoneinfo/README.old	Mon Mar 30 17:13:38 1987
--- /usr/src/share/zoneinfo/README	Fri Nov 29 20:25:10 1996
***************
*** 1,4 ****
! @(#)README	3.1
  
  Please send comments or information to
  	seismo!elsie!tz
--- 1,4 ----
! @(#)README	3.2 1996/11/29
  
  Please send comments or information to
  	seismo!elsie!tz
***************
*** 9,19 ****
  
  This version of the time zone software uses a new format
  (based on the work of Guy Harris, a.k.a guy@sun.UUCP)
! for the time zone information files.  They are now stored by default in a
! directory named "/etc/zoneinfo" rather than "/etc/tzdir" or "/etc/timezones"
! as before.  If you've already compiled programs with older time zone software,
! just leave the "/etc/tzdir" and/or "/etc/timezones" files around until you
! have a chance to recompile.
  
  For better compatability with other versions of time conversion functions,
  the time zone abbreviation to be used with localtime's return value is now
--- 9,18 ----
  
  This version of the time zone software uses a new format
  (based on the work of Guy Harris, a.k.a guy@sun.UUCP)
! for the time zone information files.  They are stored in a
! directory named "/usr/share/zoneinfo".
! If you've already compiled programs with older time zone software,
! you may need to make a copy of /usr/share/zoneinfo to the old location.
  
  For better compatability with other versions of time conversion functions,
  the time zone abbreviation to be used with localtime's return value is now
*** /usr/src/share/zoneinfo/Theory.old	Mon Mar 30 17:13:39 1987
--- /usr/src/share/zoneinfo/Theory	Fri Nov 29 20:25:55 1996
***************
*** 1,4 ****
! @(#)Theory	3.1
  
  These time and date functions are much like the System V Release 2.0 (SVR2)
  time and date functions; there are a few additions and changes to extend
--- 1,4 ----
! @(#)Theory	3.2 1996/11/29
  
  These time and date functions are much like the System V Release 2.0 (SVR2)
  time and date functions; there are a few additions and changes to extend
***************
*** 97,103 ****
  	this lets users control the time zone used in doing time conversions.
  	Users who don't try to control things (that is, users who do not set
  	the environment variable TZ) get the time conversion specified in the
! 	file "/etc/zoneinfo/localtime"; see the time zone compiler writeup for
  	information on how to initialize this file.
  
  *	The BSD "dysize" function is only included if the preprocessor symbol
--- 97,103 ----
  	this lets users control the time zone used in doing time conversions.
  	Users who don't try to control things (that is, users who do not set
  	the environment variable TZ) get the time conversion specified in the
! 	file "/etc/localtime"; see the time zone compiler writeup for
  	information on how to initialize this file.
  
  *	The BSD "dysize" function is only included if the preprocessor symbol
*** /usr/src/share/zoneinfo/zdump.8.old	Mon Mar 30 17:13:40 1987
--- /usr/src/share/zoneinfo/zdump.8	Fri Nov 29 20:26:48 1996
***************
*** 36,42 ****
  .BI "\-c " cutoffyear
  Cut off the verbose output near the start of the given year.
  .SH FILES
! /etc/zoneinfo	standard zone information directory
  .SH "SEE ALSO"
  newctime(3), tzfile(5), zic(8)
! .. @(#)zdump.8	3.1
--- 36,42 ----
  .BI "\-c " cutoffyear
  Cut off the verbose output near the start of the given year.
  .SH FILES
! /usr/share/zoneinfo	standard zone information directory
  .SH "SEE ALSO"
  newctime(3), tzfile(5), zic(8)
! .. @(#)zdump.8	3.2
*** /usr/src/share/zoneinfo/zic.8.old	Mon Mar 30 17:13:40 1987
--- /usr/src/share/zoneinfo/zic.8	Fri Nov 29 20:27:11 1996
***************
*** 288,294 ****
  field of the earliest transition time's rule to ensure that
  the earliest transition time recorded in the compiled file is correct.
  .SH FILES
! /etc/zoneinfo	standard directory used for created files
  .SH "SEE ALSO"
  newctime(3), tzfile(5), zdump(8)
! .. @(#)zic.8	3.1
--- 288,294 ----
  field of the earliest transition time's rule to ensure that
  the earliest transition time recorded in the compiled file is correct.
  .SH FILES
! /usr/share/zoneinfo	standard directory used for created files
  .SH "SEE ALSO"
  newctime(3), tzfile(5), zdump(8)
! .. @(#)zic.8	3.2
*** /usr/src/sys/OTHERS/ht/ht_fix.old	Wed May 27 21:38:40 1987
--- /usr/src/sys/OTHERS/ht/ht_fix	Sun Nov 17 22:12:39 1996
***************
*** 37,50 ****
  		name=`expr $unit '*' 2` ; one=`expr $name + 1`
  		norew=`expr $unit + 128` ; hidens=`expr $unit + 64`
  		norewhidens=`expr $unit + 192`
! 		/etc/mknod mt$name	b $blk $unit
! 		/etc/mknod mt$one	b $blk $hidens
! 		/etc/mknod nmt$name	b $blk $norew
! 		/etc/mknod nmt$one	b $blk $norewhidens
! 		/etc/mknod rmt$name	c $chr $unit
! 		/etc/mknod rmt$one	c $chr $hidens
! 		/etc/mknod nrmt$name	c $chr $norew
! 		/etc/mknod nrmt$one	c $chr $norewhidens
  		umask 77
  		;;
  	*)
--- 37,50 ----
  		name=`expr $unit '*' 2` ; one=`expr $name + 1`
  		norew=`expr $unit + 128` ; hidens=`expr $unit + 64`
  		norewhidens=`expr $unit + 192`
! 		mknod mt$name	b $blk $unit
! 		mknod mt$one	b $blk $hidens
! 		mknod nmt$name	b $blk $norew
! 		mknod nmt$one	b $blk $norewhidens
! 		mknod rmt$name	c $chr $unit
! 		mknod rmt$one	c $chr $hidens
! 		mknod nrmt$name	c $chr $norew
! 		mknod nrmt$one	c $chr $norewhidens
  		umask 77
  		;;
  	*)
*** /usr/src/sys/pdpdist/MAKEDEV.old	Sat Jun 17 23:47:20 1995
--- /usr/src/sys/pdpdist/MAKEDEV	Wed Nov 27 21:22:14 1996
***************
*** 4,10 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)MAKEDEV	4.27.2 (2.11BSD GTE) 1995/06/17
  #
  # Device "make" file.  Valid arguments:
  #	std	standard devices
--- 4,10 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)MAKEDEV	4.27.4 (2.11BSD GTE) 1996/11/16
  #
  # Device "make" file.  Valid arguments:
  #	std	standard devices
***************
*** 44,49 ****
--- 44,50 ----
  #	dn*		dn11 dialer
  #	ingreslock	Ingres lock driver.
  
+ PATH=/sbin:/usr/sbin:/bin:/usr/bin
  umask 77
  for i
  do
***************
*** 50,62 ****
  case $i in
  
  std)
! 	/etc/mknod console	c 0 0
! #	/etc/mknod kUmem	c 1 3	; chmod 600 kUmem ;: untested
! 	/etc/mknod kmem		c 1 1	; chmod 640 kmem ; chgrp kmem kmem
! 	/etc/mknod mem		c 1 0	; chmod 640 mem ; chgrp kmem mem
! 	/etc/mknod null		c 1 2	; chmod 666 null
! 	/etc/mknod tty		c 9 0	; chmod 666 tty
!  	/etc/mknod klog		c 22 0	; chmod 600 klog
  	;;
  
  ht*|tm*|ts*|tu*)
--- 51,64 ----
  case $i in
  
  std)
! 	mknod console	c 0 0
! #	mknod kUmem	c 1 3	; chmod 600 kUmem ;: untested
! 	mknod kmem		c 1 1	; chmod 640 kmem ; chgrp kmem kmem
! 	mknod mem		c 1 0	; chmod 640 mem ; chgrp kmem mem
! 	mknod null		c 1 2	; chmod 666 null
! 	mknod zero		c 1 3	; chmod 444 zero
! 	mknod tty		c 9 0	; chmod 666 tty
!  	mknod klog		c 22 0	; chmod 600 klog
  	;;
  
  ht*|tm*|ts*|tu*)
***************
*** 82,118 ****
  		twenty=`expr $zero + 20`
  		twentyfour=`expr $zero + 24`
  		twentyeight=`expr $zero + 28`
! 		/etc/mknod mt$zero	b $blk $zero
! 		/etc/mknod mt$four	b $blk $four
! 		/etc/mknod mt$eight	b $blk $eight
! 		/etc/mknod mt$twelve	b $blk $twelve
! 		/etc/mknod nmt$zero	b $blk $four ;: v7 compatibility
! 		/etc/mknod nmt$eight	b $blk $twelve ;: ditto
! 		/etc/mknod nrmt$zero	c $chr $four ;: ditto
! 		/etc/mknod nrmt$eight	c $chr $twelve ;: ditto
! 		/etc/mknod rmt$zero	c $chr $zero
! 		/etc/mknod rmt$four	c $chr $four
! 		/etc/mknod rmt$eight	c $chr $eight
! 		/etc/mknod rmt$twelve	c $chr $twelve
  		if [ `expr $i : '\(..\)'` = tu ]
  		then
! 		/etc/mknod mt$sixteen	b $blk $sixteen
! 		/etc/mknod mt$twenty	b $blk $twenty
! 		/etc/mknod mt$twentyfour b $blk $twentyfour
! 		/etc/mknod mt$twentyeight b $blk $twentyeight
! 		/etc/mknod nmt$sixteen	b $blk $twenty ;: v7 compatibility
! 		/etc/mknod nmt$twentyfour b $blk $twentyeight ;: ditto
! 		/etc/mknod nrmt$sixteen c $chr $twenty ;: ditto
! 		/etc/mknod nrmt$twentyfour c $chr $twentyeight ;: ditto
! 		/etc/mknod rmt$sixteen	c $chr $sixteen
! 		/etc/mknod rmt$twenty	c $chr $twenty
! 		/etc/mknod rmt$twentyfour c $chr $twentyfour
! 		/etc/mknod rmt$twentyeight c $chr $twentyeight
  		fi
  		if [ `expr $i : '\(..\)'` = ut ]
  		then
! 			/etc/mknod mt$twenty	b $blk $twenty
! 			/etc/mknod rmt$twenty	c $chr $twenty
  		fi
  		done
  		;;
--- 84,120 ----
  		twenty=`expr $zero + 20`
  		twentyfour=`expr $zero + 24`
  		twentyeight=`expr $zero + 28`
! 		mknod mt$zero	b $blk $zero
! 		mknod mt$four	b $blk $four
! 		mknod mt$eight	b $blk $eight
! 		mknod mt$twelve	b $blk $twelve
! 		mknod nmt$zero	b $blk $four ;: v7 compatibility
! 		mknod nmt$eight	b $blk $twelve ;: ditto
! 		mknod nrmt$zero	c $chr $four ;: ditto
! 		mknod nrmt$eight	c $chr $twelve ;: ditto
! 		mknod rmt$zero	c $chr $zero
! 		mknod rmt$four	c $chr $four
! 		mknod rmt$eight	c $chr $eight
! 		mknod rmt$twelve	c $chr $twelve
  		if [ `expr $i : '\(..\)'` = tu ]
  		then
! 		mknod mt$sixteen	b $blk $sixteen
! 		mknod mt$twenty	b $blk $twenty
! 		mknod mt$twentyfour b $blk $twentyfour
! 		mknod mt$twentyeight b $blk $twentyeight
! 		mknod nmt$sixteen	b $blk $twenty ;: v7 compatibility
! 		mknod nmt$twentyfour b $blk $twentyeight ;: ditto
! 		mknod nrmt$sixteen c $chr $twenty ;: ditto
! 		mknod nrmt$twentyfour c $chr $twentyeight ;: ditto
! 		mknod rmt$sixteen	c $chr $sixteen
! 		mknod rmt$twenty	c $chr $twenty
! 		mknod rmt$twentyfour c $chr $twentyfour
! 		mknod rmt$twentyeight c $chr $twentyeight
  		fi
  		if [ `expr $i : '\(..\)'` = ut ]
  		then
! 			mknod mt$twenty	b $blk $twenty
! 			mknod rmt$twenty	c $chr $twenty
  		fi
  		done
  		;;
***************
*** 131,138 ****
  	case $i in
  	rk*) name=rk; blk=6; chr=15;;
  	esac
! 	/etc/mknod ${name}${unit}h b ${blk} ${unit}
! 	/etc/mknod r${name}${unit}h c ${chr} ${unit}
  	chgrp operator ${name}${unit}h r${name}${unit}h
  	chmod 640 ${name}${unit}h r${name}${unit}h
  	;;
--- 133,140 ----
  	case $i in
  	rk*) name=rk; blk=6; chr=15;;
  	esac
! 	mknod ${name}${unit}h b ${blk} ${unit}
! 	mknod r${name}${unit}h c ${chr} ${unit}
  	chgrp operator ${name}${unit}h r${name}${unit}h
  	chmod 640 ${name}${unit}h r${name}${unit}h
  	;;
***************
*** 156,162 ****
  	# Note, this must come *before* the "ra*".  The entry "rram" is for
  	# auto fscks when ram is mentioned in /etc/fstab.
  	umask 2
! 	/etc/mknod ram b 3 0
  	ln ram rram
  	chgrp operator ram
  	chmod 640 ram
--- 158,164 ----
  	# Note, this must come *before* the "ra*".  The entry "rram" is for
  	# auto fscks when ram is mentioned in /etc/fstab.
  	umask 2
! 	mknod ram b 3 0
  	ln ram rram
  	chgrp operator ram
  	chmod 640 ram
***************
*** 176,197 ****
  	case $unit in
  	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|\
  	17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)
! 		/etc/mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
! 		/etc/mknod ${name}${unit}b	b $blk `expr $unit '*' 8 + 1`
! 		/etc/mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
! 		/etc/mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
! 		/etc/mknod ${name}${unit}e	b $blk `expr $unit '*' 8 + 4`
! 		/etc/mknod ${name}${unit}f	b $blk `expr $unit '*' 8 + 5`
! 		/etc/mknod ${name}${unit}g	b $blk `expr $unit '*' 8 + 6`
! 		/etc/mknod ${name}${unit}h	b $blk `expr $unit '*' 8 + 7`
! 		/etc/mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
! 		/etc/mknod r${name}${unit}b	c $chr `expr $unit '*' 8 + 1`
! 		/etc/mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
! 		/etc/mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
! 		/etc/mknod r${name}${unit}e	c $chr `expr $unit '*' 8 + 4`
! 		/etc/mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
! 		/etc/mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
! 		/etc/mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
  		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
  		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
  		;;
--- 178,199 ----
  	case $unit in
  	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|\
  	17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)
! 		mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
! 		mknod ${name}${unit}b	b $blk `expr $unit '*' 8 + 1`
! 		mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
! 		mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
! 		mknod ${name}${unit}e	b $blk `expr $unit '*' 8 + 4`
! 		mknod ${name}${unit}f	b $blk `expr $unit '*' 8 + 5`
! 		mknod ${name}${unit}g	b $blk `expr $unit '*' 8 + 6`
! 		mknod ${name}${unit}h	b $blk `expr $unit '*' 8 + 7`
! 		mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
! 		mknod r${name}${unit}b	c $chr `expr $unit '*' 8 + 1`
! 		mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
! 		mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
! 		mknod r${name}${unit}e	c $chr `expr $unit '*' 8 + 4`
! 		mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
! 		mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
! 		mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
  		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
  		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
  		;;
***************
*** 208,214 ****
  	0|1|2|3|4|5|6|7)
  		eval `echo $unit | awk ' { u = $1 } END {
  		    for (i = 0; i < 8; i++)
! 			printf("/etc/mknod tty%02d c 2 %d; ",u*8+i,u*8+i); }'`
  		;;
  	*)
  		echo bad unit for dz in: $i
--- 210,216 ----
  	0|1|2|3|4|5|6|7)
  		eval `echo $unit | awk ' { u = $1 } END {
  		    for (i = 0; i < 8; i++)
! 			printf("mknod tty%02d c 2 %d; ",u*8+i,u*8+i); }'`
  		;;
  	*)
  		echo bad unit for dz in: $i
***************
*** 260,268 ****
  	  awk ' { ch = $1; u = $4 * $2; m = $3; cnt = $4 } END {
  	    for (i = 0; i < cnt; i++)
  	      if (i < 10)
! 		printf("/etc/mknod tty%s%x c %d %d; ",ch,i,m,u+i);
  	      else
! 		printf("/etc/mknod tty%s%c c %d %d; ",ch,87+i,m,u+i); }'`
  	;;
  
  # extra DL-11 units not including the console.  unit numbers start at 1 because
--- 262,270 ----
  	  awk ' { ch = $1; u = $4 * $2; m = $3; cnt = $4 } END {
  	    for (i = 0; i < cnt; i++)
  	      if (i < 10)
! 		printf("mknod tty%s%x c %d %d; ",ch,i,m,u+i);
  	      else
! 		printf("mknod tty%s%c c %d %d; ",ch,87+i,m,u+i); }'`
  	;;
  
  # extra DL-11 units not including the console.  unit numbers start at 1 because
***************
*** 276,282 ****
  	unit=`expr $i : "$name\(.*\)"`
  	case $unit in
  	1|2|3|4|5|6|7)
! 		/etc/mknod tty${ch}${unit} c $major $unit;
  		;;
  	*)
  		echo bad unit for $name in: $i
--- 278,284 ----
  	unit=`expr $i : "$name\(.*\)"`
  	case $unit in
  	1|2|3|4|5|6|7)
! 		mknod tty${ch}${unit} c $major $unit;
  		;;
  	*)
  		echo bad unit for $name in: $i
***************
*** 296,302 ****
  	unit=`expr $i : "$name\(.*\)"`
  	case $unit in
  	0|1|2|3|4|5|6|7)
! 		/etc/mknod $i c $major $unit;
  		chmod 666 $i
  		;;
  	*)
--- 298,304 ----
  	unit=`expr $i : "$name\(.*\)"`
  	case $unit in
  	0|1|2|3|4|5|6|7)
! 		mknod $i c $major $unit;
  		chmod 666 $i
  		;;
  	*)
***************
*** 321,328 ****
  		umask 0
  		eval `echo $offset $name | awk ' { b=$1; n=$2 } END {
  			for (i = 0; i < 16; i++)
! 				printf("/etc/mknod tty%s%x c 11 %d; \
! 					/etc/mknod pty%s%x c 10 %d; ", \
  					n, i, b+i, n, i, b+i); }'`
  		umask 77
  		;;
--- 323,330 ----
  		umask 0
  		eval `echo $offset $name | awk ' { b=$1; n=$2 } END {
  			for (i = 0; i < 16; i++)
! 				printf("mknod tty%s%x c 11 %d; \
! 					mknod pty%s%x c 10 %d; ", \
  					n, i, b+i, n, i, b+i); }'`
  		umask 77
  		;;
***************
*** 337,343 ****
  	case $unit in
  	0|1|2|3|4|5|6|7)
  		umask 0
! 		/etc/mknod ${name}${unit} c ${chr} ${unit}
  		umask 77
  		;;
  	*)
--- 339,345 ----
  	case $unit in
  	0|1|2|3|4|5|6|7)
  		umask 0
! 		mknod ${name}${unit} c ${chr} ${unit}
  		umask 77
  		;;
  	*)
*** /usr/src/sys/pdpdist/inetd.conf.old	Wed Nov 13 21:47:24 1996
--- /usr/src/sys/pdpdist/inetd.conf	Sun Nov 17 22:17:37 1996
***************
*** 1,18 ****
  #
  # Internet server configuration database
  #
! ftp	stream	tcp	nowait	root	/etc/ftpd	ftpd -l
! telnet	stream	tcp	nowait	root	/etc/telnetd	telnetd
! shell	stream	tcp	nowait	root	/etc/rshd	rshd
! login	stream	tcp	nowait	root	/etc/rlogind	rlogind
! exec	stream	tcp	nowait	root	/etc/rexecd	rexecd
  #uucpd	stream	tcp	nowait	root	/usr/libexec/uucpd	uucpd
! #nntp	stream	tcp	nowait	usenet	/etc/nntpd	nntpd
! #finger	stream	tcp	nowait	nobody	/etc/fingerd	fingerd
! #tftp	dgram	udp	wait	nobody	/etc/tftpd	tftpd
! comsat	dgram	udp	wait	root	/etc/comsat	comsat
! #talk	dgram	udp	wait	root	/etc/talkd	talkd
! #ntalk   dgram   udp     wait    root    /etc/ntalkd     ntalkd
  echo	stream	tcp	nowait	root	internal
  #discard	stream	tcp	nowait	root	internal
  #chargen	stream	tcp	nowait	root	internal
--- 1,18 ----
  #
  # Internet server configuration database
  #
! ftp	stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -l
! telnet	stream	tcp	nowait	root	/usr/libexec/telnetd	telnetd
! shell	stream	tcp	nowait	root	/usr/libexec/rshd	rshd
! login	stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind
! #exec	stream	tcp	nowait	root	/usr/libexec/rexecd	rexecd
  #uucpd	stream	tcp	nowait	root	/usr/libexec/uucpd	uucpd
! #nntp	stream	tcp	nowait	usenet	/news/lib/nntpd	nntpd
! #finger	stream	tcp	nowait	nobody	/usr/libexec/fingerd	fingerd
! #tftp	dgram	udp	wait	nobody	/usr/libexec/tftpd	tftpd
! comsat	dgram	udp	wait	root	/usr/libexec/comsat	comsat
! #talk	dgram	udp	wait	root	/usr/libexec/talkd	talkd
! #ntalk   dgram   udp     wait    root    /usr/libexec/ntalkd     ntalkd
  echo	stream	tcp	nowait	root	internal
  #discard	stream	tcp	nowait	root	internal
  #chargen	stream	tcp	nowait	root	internal
*** /usr/src/sys/pdpdist/netstart.old	Thu Dec 24 18:21:36 1992
--- /usr/src/sys/pdpdist/netstart	Sun Nov 17 22:20:43 1996
***************
*** 1,8 ****
  #!/bin/sh -
  
! #	@(#)netstart	5.2 (Berkeley) 7/16/88
  
! INET=`/etc/testnet`
  if [ $INET = YES ]; then
  	echo Assuming NETWORKING system ...		>/dev/console 2>&1
  else
--- 1,8 ----
  #!/bin/sh -
  
! #	@(#)netstart	5.2.1 (2.11BSD) 1996/11/17
  
! INET=`testnet`
  if [ $INET = YES ]; then
  	echo Assuming NETWORKING system ...		>/dev/console 2>&1
  else
***************
*** 31,42 ****
  hostid $hostname					>/dev/console 2>&1
  
  if [ $INET = YES ]; then
! 	# /etc/ifconfig imp0 inet netmask $netmask $hostname broadcast $broadcast up -trailers >/dev/console 2>&1
! 	# /etc/ifconfig en0 inet netmask $netmask $hostname broadcast $broadcast up -trailers >/dev/console 2>&1
! 	# /etc/ifconfig il0 inet netmask $netmask $hostname broadcast $broadcast up -trailers >/dev/console 2>&1
! 	# /etc/ifconfig qe0 inet netmask $netmask $hostname broadcast $broadcast up -trailers >/dev/console 2>&1
! 	/etc/ifconfig lo0 inet localhost up -trailers	>/dev/console 2>&1
  
! 	/etc/route add $hostname localhost 0		>/dev/console 2>&1
! 	/etc/route add default $default 1		>/dev/console 2>&1
  fi
--- 31,42 ----
  hostid $hostname					>/dev/console 2>&1
  
  if [ $INET = YES ]; then
! 	# ifconfig imp0 inet netmask $netmask $hostname broadcast $broadcast up -trailers >/dev/console 2>&1
! 	# ifconfig en0 inet netmask $netmask $hostname broadcast $broadcast up -trailers >/dev/console 2>&1
! 	# ifconfig il0 inet netmask $netmask $hostname broadcast $broadcast up -trailers >/dev/console 2>&1
! 	# ifconfig qe0 inet netmask $netmask $hostname broadcast $broadcast up -trailers >/dev/console 2>&1
! 	ifconfig lo0 inet localhost up -trailers	>/dev/console 2>&1
  
! 	route add $hostname localhost 0		>/dev/console 2>&1
! 	route add default $default 1		>/dev/console 2>&1
  fi
*** /usr/src/sys/pdpdist/rc.local.old	Fri Oct 25 21:21:13 1996
--- /usr/src/sys/pdpdist/rc.local	Sun Nov 17 22:23:29 1996
***************
*** 7,21 ****
  chmod 666 /etc/motd
  
  echo -n			starting local daemons:			>/dev/console 2>&1
! #if [ $INET = YES -a -f /etc/timed ]; then
  #	timed &				echo -n ' timed'	>/dev/console 2>&1
  #fi
  if [ -f /usr/sbin/sendmail ]; then
  	(cd /usr/spool/mqueue; rm -f lf*)
  	if [ $INET = YES ]; then
! 		/usr/sbin/sendmail -bd -q30m; echo -n ' sendmail'>/dev/console 2>&1
  	else
! 		/usr/sbin/sendmail -q30m; echo -n ' sendmail'	>/dev/console 2>&1
  	fi
  fi
  				echo '.'			>/dev/console 2>&1
--- 7,23 ----
  chmod 666 /etc/motd
  
  echo -n			starting local daemons:			>/dev/console 2>&1
! #if [ $INET = YES -a -f /usr/sbin/timed ]; then
  #	timed &				echo -n ' timed'	>/dev/console 2>&1
  #fi
  if [ -f /usr/sbin/sendmail ]; then
  	(cd /usr/spool/mqueue; rm -f lf*)
  	if [ $INET = YES ]; then
! 		/usr/sbin/sendmail -bd -q1h; echo -n ' sendmail'>/dev/console 2>&1
  	else
! 		/usr/sbin/sendmail -q1h; echo -n ' sendmail'	>/dev/console 2>&1
  	fi
  fi
  				echo '.'			>/dev/console 2>&1
+ 
+ ntpd
*** /usr/src/sys/pdpdist/rc.old	Wed Nov 13 21:48:20 1996
--- /usr/src/sys/pdpdist/rc	Wed Nov 27 21:24:07 1996
***************
*** 1,5 ****
  HOME=/; export HOME
! PATH=/etc:/bin:/sbin:/usr/sbin:/usr/ucb:/usr/bin; export PATH
  
  # If you have a ram disk configured into your system which is listed in
  # /etc/fstab, you'll have to do a mkfs on it here and probably change the
--- 1,8 ----
+ #
+ #	@(#)rc	2.2 (2.11BSD) 1996/11/27
+ #
  HOME=/; export HOME
! PATH=/bin:/sbin:/usr/sbin:/usr/ucb:/usr/bin; export PATH
  
  # If you have a ram disk configured into your system which is listed in
  # /etc/fstab, you'll have to do a mkfs on it here and probably change the
***************
*** 14,20 ****
  
  if [ ${RAMSIZE} != 0 ]
  then
! 	/etc/mkfs /dev/ram ${RAMSIZE} 1 2
  fi
  
  if [ "$2" = powerfail ]
--- 17,23 ----
  
  if [ ${RAMSIZE} != 0 ]
  then
! 	mkfs /dev/ram ${RAMSIZE} 1 2
  fi
  
  if [ "$2" = powerfail ]
***************
*** 23,28 ****
--- 26,32 ----
  fi
  if [ "$1" = fastboot ]
  then
+ 	echo ''
  	echo Fast boot ... skipping disk checks		>/dev/console 2>&1
  elif [ "$1" = autoboot ]
  then
***************
*** 66,72 ****
--- 70,85 ----
   	echo 'password file may be incorrect' > /dev/console
  fi
  
+ #
+ # First umount everything in case the system is going back into multiuser
+ # mode.  If the system is being booted for the first time nothing is mounted
+ # except the root filesystem and umount ignores attempts to unmount /.
+ #
  umount -a
+ #
+ # Now mount everything mentioned in /etc/fstab *except* filesystems with the
+ # 'na' (noauto) option.
+ #
  mount -a						>/dev/console 2>&1
  
  if [ ${RAMSIZE} != 0 ]
***************
*** 75,86 ****
  	chmod ${RAMMODE} ${RAMFS}
  fi
  
! 			echo -n 'checking quotas:'	>/dev/console 2>&1
! quotacheck -a -p					>/dev/console 2>&1
! 			echo ' done.'			>/dev/console 2>&1
  quotaon -a
  
! ps -U							>/dev/console 2>&1
  rm -f /etc/nologin
  rm -f /usr/spool/uucp/LCK.*
  rm -f /usr/spool/uucp/STST/*
--- 88,101 ----
  	chmod ${RAMMODE} ${RAMFS}
  fi
  
! 	echo -n 'checking quotas:'	>/dev/console 2>&1
! 	quotacheck -a 			>/dev/console 2>&1
! 	echo ' done.'			>/dev/console 2>&1
  quotaon -a
  
! dev_mkdb
! 
! ps -U					>/dev/console 2>&1
  rm -f /etc/nologin
  rm -f /usr/spool/uucp/LCK.*
  rm -f /usr/spool/uucp/STST/*
***************
*** 99,116 ****
  # if core dumps are to be saved.
  if [ -d /etc/crash ]; then
  	echo		'checking for core dump... '	>/dev/console 2>&1
! 	savecore /etc/crash				>/dev/console 2>&1
  fi
  
! 			echo preserving editor files 	>/dev/console 2>&1
! (cd /tmp; /usr/sbin/expreserve -a)
! 			echo clearing /tmp 		>/dev/console 2>&1
  (cd /tmp; find . ! -name . ! -name lost+found ! -name quotas -exec rm -r {} \; )
  
  			echo -n standard daemons:	>/dev/console 2>&1
! update;			echo -n ' update'		>/dev/console 2>&1
! cron;			echo -n ' cron'			>/dev/console 2>&1
! accton /usr/adm/acct;	echo -n ' accounting'		>/dev/console 2>&1
  			echo '.'			>/dev/console 2>&1
  
  if [ $INET = YES ]; then
--- 114,131 ----
  # if core dumps are to be saved.
  if [ -d /etc/crash ]; then
  	echo		'checking for core dump... '	>/dev/console 2>&1
! 	savecore /etc/crash			>/dev/console 2>&1
  fi
  
! 		echo preserving editor files 	>/dev/console 2>&1
! 		(cd /tmp; /usr/sbin/expreserve -a)
! 		echo clearing /tmp 		>/dev/console 2>&1
  (cd /tmp; find . ! -name . ! -name lost+found ! -name quotas -exec rm -r {} \; )
  
  			echo -n standard daemons:	>/dev/console 2>&1
! update;		echo -n ' update'		>/dev/console 2>&1
! cron;		echo -n ' cron'			>/dev/console 2>&1
! accton /usr/adm/acct;	echo -n ' accounting'	>/dev/console 2>&1
  			echo '.'			>/dev/console 2>&1
  
  if [ $INET = YES ]; then
***************
*** 119,138 ****
  	# $routedflags is imported from /etc/netstart;
  	# if $routedflags == NO, routed isn't run.
  	if [ "${routedflags-NO}" != NO ]; then
! 		routed $routedflags; echo -n ' routed'	>/dev/console 2>&1
  	fi
  
  	# $named is imported from /etc/netstart;
  	# if $named is set to something other than NO, named is run.
  	if [ "${named-NO}" != NO ]; then
! 		named;			echo -n ' named'>/dev/console 2>&1
  	fi
  	/usr/sbin/inetd;		echo -n ' inetd'>/dev/console 2>&1
  
  	# $rwhod is imported from /etc/netstart;
  	# if $rwhod is set to something other than NO, rwhod is run.
! 	if [ "${rwhod-NO}" != NO ]; then
! 		rwhod;		echo -n ' rwhod'	>/dev/console 2>&1
  	fi
  	rm -f /dev/printer
  	/usr/sbin/lpd;		echo -n ' printer'	>/dev/console 2>&1
--- 134,153 ----
  	# $routedflags is imported from /etc/netstart;
  	# if $routedflags == NO, routed isn't run.
  	if [ "${routedflags-NO}" != NO ]; then
! 		routed $routedflags; echo -n ' routed' >/dev/console 2>&1
  	fi
  
  	# $named is imported from /etc/netstart;
  	# if $named is set to something other than NO, named is run.
  	if [ "${named-NO}" != NO ]; then
! 		named;		echo -n ' named'>/dev/console 2>&1
  	fi
  	/usr/sbin/inetd;		echo -n ' inetd'>/dev/console 2>&1
  
  	# $rwhod is imported from /etc/netstart;
  	# if $rwhod is set to something other than NO, rwhod is run.
! 	if [ "${rwhod}" != NO ]; then
! 		rwhod;	echo -n ' rwhod'	>/dev/console 2>&1
  	fi
  	rm -f /dev/printer
  	/usr/sbin/lpd;		echo -n ' printer'	>/dev/console 2>&1
***************
*** 139,149 ****
  				echo '.'		>/dev/console 2>&1
  else
  	# lpd will run even with out networking.
! 		echo starting lpd			>/dev/console 2>&1
  	/usr/sbin/lpd
  fi
  
! . /etc/rc.local
  
! 			date				>/dev/console 2>&1
  exit 0
--- 154,164 ----
  				echo '.'		>/dev/console 2>&1
  else
  	# lpd will run even with out networking.
! 	echo starting lpd			>/dev/console 2>&1
  	/usr/sbin/lpd
  fi
  
! /etc/rc.local
  
! date				>/dev/console 2>&1
  exit 0
