*BSD News Article 85058


Return to BSD News archive

Newsgroups: comp.bugs.2bsd
Path: euryale.cc.adfa.oz.au!newshost.carno.net.au!harbinger.cc.monash.edu.au!news.cs.su.oz.au!metro!metro!munnari.OZ.AU!news.ecn.uoknor.edu!feed1.news.erols.com!hunter.premier.net!news.mathworks.com!news.kei.com!news.thenet.net!wlbr!moe.2bsd.com!sms
From: sms@moe.2bsd.com (Steven M. Schultz)
Subject: The Grand Reorganization Continues (#346 - 3 of 8)
Organization: 2BSD, Simi Valley CA USA
Message-ID: <E28DuD.J5J@moe.2bsd.com>
Date: Wed, 11 Dec 1996 04:01:24 GMT
Lines: 2554
Xref: euryale.cc.adfa.oz.au comp.bugs.2bsd:709

Subject: The Grand Reorganization Continues (#346 - 3 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 #346 (part 3 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.

-----------------------#346 Cut here---------------------------
*** /dev/MAKEDEV.43.old	Thu Feb 26 15:12:47 1987
--- /dev/MAKEDEV.43	Sat Nov 16 13:33:49 1996
***************
*** 4,10 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)MAKEDEV	4.27 (Berkeley) 4/15/86
  #
  # 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.1 (2.11BSD) 1996/11/16
  #
  # Device "make" file.  Valid arguments:
  #	std	standard devices
***************
*** 44,49 ****
--- 44,51 ----
  #	ps*	unibus interface to e&s picture system 2
  #	ad*	unibus interface to data translation a/d converter
  #	np*	unibus ethernet co-processor interface, for downloading.
+ 
+ PATH=/etc:/sbin:/usr/sbin:/bin:/usr/bin
  umask 77
  for i
  do
***************
*** 50,67 ****
  case $i in
  
  std)
! 	/etc/mknod console	c 0 0
! 	/etc/mknod drum		c 7 0	; chmod 640 drum ; chgrp kmem drum
! 	/etc/mknod floppy	c 8 0
! 	/etc/mknod crl		c 35 0
! 	/etc/mknod tu0		b 8 0
! 	/etc/mknod tu1		b 8 1
! 	/etc/mknod kUmem	c 3 3	; chmod 600 kUmem ;: untested
! 	/etc/mknod kmem		c 3 1	; chmod 640 kmem ; chgrp kmem kmem
! 	/etc/mknod mem		c 3 0	; chmod 640 mem ; chgrp kmem mem
! 	/etc/mknod null		c 3 2	; chmod 666 null
! 	/etc/mknod tty		c 2 0	; chmod 666 tty
! 	/etc/mknod klog		c 33 0	; chmod 600 klog
  	;;
  
  ht*|tm*|ts*|mt*|ut*)
--- 52,69 ----
  case $i in
  
  std)
! 	mknod console	c 0 0
! 	mknod drum		c 7 0	; chmod 640 drum ; chgrp kmem drum
! 	mknod floppy	c 8 0
! 	mknod crl		c 35 0
! 	mknod tu0		b 8 0
! 	mknod tu1		b 8 1
! 	mknod kUmem	c 3 3	; chmod 600 kUmem ;: untested
! 	mknod kmem		c 3 1	; chmod 640 kmem ; chgrp kmem kmem
! 	mknod mem		c 3 0	; chmod 640 mem ; chgrp kmem mem
! 	mknod null		c 3 2	; chmod 666 null
! 	mknod tty		c 2 0	; chmod 666 tty
! 	mknod klog		c 33 0	; chmod 600 klog
  	;;
  
  ht*|tm*|ts*|mt*|ut*)
***************
*** 77,98 ****
  	0|1|2|3|4|5|6|7)
  		four=`expr $unit + 4` ; eight=`expr $unit + 8`
  		twelve=`expr $unit + 12`; twenty=`expr $unit + 20`
! 		/etc/mknod mt$unit	b $blk $unit
! 		/etc/mknod mt$four	b $blk $four
! 		/etc/mknod mt$eight	b $blk $eight
! 		/etc/mknod mt$twelve	b $blk $twelve
! 		/etc/mknod nmt$unit	b $blk $four ;: sanity w/pdp11 v7
! 		/etc/mknod nmt$eight	b $blk $twelve ;: ditto
! 		/etc/mknod nrmt$unit	c $chr $four ;: sanity w/pdp11 v7
! 		/etc/mknod nrmt$eight	c $chr $twelve ;: ditto
! 		/etc/mknod rmt$unit	c $chr $unit
! 		/etc/mknod rmt$four	c $chr $four
! 		/etc/mknod rmt$eight	c $chr $eight
! 		/etc/mknod rmt$twelve	c $chr $twelve
  		if [ $i = ut ] 
  		then
! 			/etc/mknod mt$twenty	b $blk $twenty
! 			/etc/mknod rmt$twenty	c $chr $twenty
  		fi
  		;;
  	*)
--- 79,100 ----
  	0|1|2|3|4|5|6|7)
  		four=`expr $unit + 4` ; eight=`expr $unit + 8`
  		twelve=`expr $unit + 12`; twenty=`expr $unit + 20`
! 		mknod mt$unit	b $blk $unit
! 		mknod mt$four	b $blk $four
! 		mknod mt$eight	b $blk $eight
! 		mknod mt$twelve	b $blk $twelve
! 		mknod nmt$unit	b $blk $four ;: sanity w/pdp11 v7
! 		mknod nmt$eight	b $blk $twelve ;: ditto
! 		mknod nrmt$unit	c $chr $four ;: sanity w/pdp11 v7
! 		mknod nrmt$eight	c $chr $twelve ;: ditto
! 		mknod rmt$unit	c $chr $unit
! 		mknod rmt$four	c $chr $four
! 		mknod rmt$eight	c $chr $eight
! 		mknod rmt$twelve	c $chr $twelve
  		if [ $i = ut ] 
  		then
! 			mknod mt$twenty	b $blk $twenty
! 			mknod rmt$twenty	c $chr $twenty
  		fi
  		;;
  	*)
***************
*** 115,138 ****
  	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}g	b $blk `expr $unit '*' 8 + 6`
! 		/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}g	c $chr `expr $unit '*' 8 + 6`
  		if [ $name != hk ]
  		then
! 		/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}h	b $blk `expr $unit '*' 8 + 7`
! 		/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`
  		fi
  		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
  		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
--- 117,140 ----
  	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}g	b $blk `expr $unit '*' 8 + 6`
! 		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}g	c $chr `expr $unit '*' 8 + 6`
  		if [ $name != hk ]
  		then
! 		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}h	b $blk `expr $unit '*' 8 + 7`
! 		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`
  		fi
  		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
  		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
***************
*** 149,159 ****
  	name=rx; chr=30; blk=12;
  	case $unit in
  	0|1|2|3|4|5|6|7)
! 		/etc/mknod ${name}${unit}	b $blk `expr $unit '*' 8 + 0`
! 		/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`
  		;;
  	*)
  		echo bad unit for floppy disk in: $i
--- 151,161 ----
  	name=rx; chr=30; blk=12;
  	case $unit in
  	0|1|2|3|4|5|6|7)
! 		mknod ${name}${unit}	b $blk `expr $unit '*' 8 + 0`
! 		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`
  		;;
  	*)
  		echo bad unit for floppy disk in: $i
***************
*** 166,173 ****
  	name=uu; blk=13;
  	case $unit in
  	0|1|2|3)
! 		/etc/mknod ${name}${unit}	b $blk `expr $unit '*' 2 + 0`
! 		/etc/mknod ${name}${unit}a	b $blk `expr $unit '*' 2 + 1`
  		;;
  	*)
  		echo bad unit for uu cassette in: $i
--- 168,175 ----
  	name=uu; blk=13;
  	case $unit in
  	0|1|2|3)
! 		mknod ${name}${unit}	b $blk `expr $unit '*' 2 + 0`
! 		mknod ${name}${unit}a	b $blk `expr $unit '*' 2 + 1`
  		;;
  	*)
  		echo bad unit for uu cassette in: $i
***************
*** 181,187 ****
  	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 1 %d; ",u*8+i,u*8+i); }'`
  		;;
  	*)
  		echo bad unit for dz in: $i
--- 183,189 ----
  	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 1 %d; ",u*8+i,u*8+i); }'`
  		;;
  	*)
  		echo bad unit for dz in: $i
***************
*** 224,232 ****
  	  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); }'`
  	;;
  
  lp*|va*|vp*)
--- 226,234 ----
  	  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); }'`
  	;;
  
  lp*|va*|vp*)
***************
*** 238,244 ****
  	unit=`expr $i : "$name\(.*\)"`
  	case $unit in
  	0|1|2|3|4|5|6|7)
! 		/etc/mknod $i c $major $unit;
  		chmod 666 $i
  		;;
  	*)
--- 240,246 ----
  	unit=`expr $i : "$name\(.*\)"`
  	case $unit in
  	0|1|2|3|4|5|6|7)
! 		mknod $i c $major $unit;
  		chmod 666 $i
  		;;
  	*)
***************
*** 263,270 ****
  		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 20 %d; \
! 					/etc/mknod pty%s%x c 21 %d; ", \
  					n, i, b+i, n, i, b+i); }'`
  		umask 77
  		;;
--- 265,272 ----
  		umask 0
  		eval `echo $offset $name | awk ' { b=$1; n=$2 } END {
  			for (i = 0; i < 16; i++)
! 				printf("mknod tty%s%x c 20 %d; \
! 					mknod pty%s%x c 21 %d; ", \
  					n, i, b+i, n, i, b+i); }'`
  		umask 77
  		;;
***************
*** 283,289 ****
  	0|1|2)
  		eval `echo $offset | awk ' { b=$1 } END {
  			for (i = 0; i < 4; i++)
! 				printf("/etc/mknod np%02d c 39 %d;", \
  					b+i, b+i); }'`
  		;;
  	esac
--- 285,291 ----
  	0|1|2)
  		eval `echo $offset | awk ' { b=$1 } END {
  			for (i = 0; i < 4; i++)
! 				printf("mknod np%02d c 39 %d;", \
  					b+i, b+i); }'`
  		;;
  	esac
***************
*** 301,307 ****
  	case $unit in
  	0|1|2|3|4|5|6|7)
  		umask 0
! 		/etc/mknod ${name}${unit} c ${chr} ${unit}
  		umask 77
  		;;
  	*)
--- 303,309 ----
  	case $unit in
  	0|1|2|3|4|5|6|7)
  		umask 0
! 		mknod ${name}${unit} c ${chr} ${unit}
  		umask 77
  		;;
  	*)
*** /dev/MAKEDEV.old	Wed May 15 20:41:07 1996
--- /dev/MAKEDEV	Sat Nov 16 13:30:30 1996
***************
*** 4,10 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)MAKEDEV	4.27.3 (2.11BSD GTE) 1996/05/15
  #
  # 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=/etc:/sbin:/usr/sbin:/bin:/usr/bin
  umask 77
  for i
  do
***************
*** 50,63 ****
  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 zero		c 1 3	; chmod 444 zero
! 	/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*)
***************
*** 83,119 ****
  		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
  		;;
***************
*** 132,139 ****
  	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
  	;;
***************
*** 157,163 ****
  	# 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
***************
*** 177,198 ****
  	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]
  		;;
***************
*** 209,215 ****
  	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
***************
*** 261,269 ****
  	  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
***************
*** 277,283 ****
  	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
***************
*** 297,303 ****
  	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
  		;;
  	*)
***************
*** 322,329 ****
  		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
  		;;
***************
*** 338,344 ****
  	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
  		;;
  	*)
*** /etc/rc.old	Wed Nov 13 21:48:50 1996
--- /etc/rc	Sat Nov 16 14:08:21 1996
***************
*** 18,24 ****
  
  if [ ${RAMSIZE} != 0 ]
  then
! 	/etc/mkfs /dev/ram ${RAMSIZE} 1 2
  fi
  
  if [ "$2" = powerfail ]
--- 18,24 ----
  
  if [ ${RAMSIZE} != 0 ]
  then
! 	mkfs /dev/ram ${RAMSIZE} 1 2
  fi
  
  if [ "$2" = powerfail ]
***************
*** 90,100 ****
  fi
  
  	echo -n 'checking quotas:'	>/dev/console 2>&1
! /etc/quotacheck -a 			>/dev/console 2>&1
  	echo ' done.'			>/dev/console 2>&1
! /etc/quotaon -a
  
! /etc/dev_mkdb
  
  ps -U					>/dev/console 2>&1
  rm -f /etc/nologin
--- 90,100 ----
  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
***************
*** 108,114 ****
  if [ $INET = YES ]; then
  			echo 'starting system logger'	>/dev/console 2>&1
  	rm -f /dev/log
! 	/etc/syslogd
  fi
  
  # /etc/crash should be a symbolic link to the crash directory
--- 108,114 ----
  if [ $INET = YES ]; then
  			echo 'starting system logger'	>/dev/console 2>&1
  	rm -f /dev/log
! 	syslogd
  fi
  
  # /etc/crash should be a symbolic link to the crash directory
***************
*** 115,132 ****
  # if core dumps are to be saved.
  if [ -d /etc/crash ]; then
  	echo		'checking for core dump... '	>/dev/console 2>&1
! 	/etc/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
! /etc/update;		echo -n ' update'		>/dev/console 2>&1
! /etc/cron;		echo -n ' cron'			>/dev/console 2>&1
! /etc/accton /usr/adm/acct;	echo -n ' accounting'	>/dev/console 2>&1
  			echo '.'			>/dev/console 2>&1
  
  if [ $INET = YES ]; then
--- 115,132 ----
  # 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
***************
*** 135,147 ****
  	# $routedflags is imported from /etc/netstart;
  	# if $routedflags == NO, routed isn't run.
  	if [ "${routedflags-NO}" != NO ]; then
! 		/etc/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
! 		/etc/named;		echo -n ' named'>/dev/console 2>&1
  	fi
  	/usr/sbin/inetd;		echo -n ' inetd'>/dev/console 2>&1
  
--- 135,147 ----
  	# $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
  
***************
*** 148,154 ****
  	# $rwhod is imported from /etc/netstart;
  	# if $rwhod is set to something other than NO, rwhod is run.
  	if [ "${rwhod}" != NO ]; then
! 		/etc/rwhod;	echo -n ' rwhod'	>/dev/console 2>&1
  	fi
  	rm -f /dev/printer
  	/usr/sbin/lpd;		echo -n ' printer'	>/dev/console 2>&1
--- 148,154 ----
  	# $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
*** /usr/doc/2.10/fsck/fsck.mm.old	Wed Jul 27 00:57:51 1983
--- /usr/doc/2.10/fsck/fsck.mm	Sat Nov 16 17:15:03 1996
***************
*** 722,728 ****
  .Hu "Can't open checklist file: \fBF\fP"
  The default file system checklist file
  \fBF\fP (usually
! .I /etc/checklist )
  can not be opened for reading.
  .I Fsck\^
  terminates on this error condition.
--- 722,728 ----
  .Hu "Can't open checklist file: \fBF\fP"
  The default file system checklist file
  \fBF\fP (usually
! .I /etc/fstab )
  can not be opened for reading.
  .I Fsck\^
  terminates on this error condition.
*** /usr/doc/2.10/setup.2.11/2.t.old	Fri Apr 12 22:09:00 1996
--- /usr/doc/2.10/setup.2.11/2.t	Sat Nov 16 17:16:51 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)2.t	1.8 (GTE) 1996/04/12
  .\"
  .ds lq ``
  .ds rq ''
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)2.t	1.9 (GTE) 1996/11/16
  .\"
  .ds lq ``
  .ds rq ''
***************
*** 587,593 ****
  To use the /usr file system, you should now remount it by
  saying
  .DS
! \fB#\fP /etc/mount /dev/${name} /usr
  .DE
  .NH 3
  Step 7: extracting remaining source from the second tape
--- 587,593 ----
  To use the /usr file system, you should now remount it by
  saying
  .DS
! \fB#\fP mount /dev/${name} /usr
  .DE
  .NH 3
  Step 7: extracting remaining source from the second tape
*** /usr/doc/2.10/setup.2.11/3.t.old	Thu Oct 24 21:36:18 1996
--- /usr/doc/2.10/setup.2.11/3.t	Wed Nov 27 21:00:11 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)3.t	1.5 (2.11BSD GTE) 1996/10/24
  .\"
  .ds lq ``
  .ds rq ''
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)3.t	1.6 (2.11BSD GTE) 1996/11/16
  .\"
  .ds lq ``
  .ds rq ''
***************
*** 72,85 ****
  /etc/gettytab	\(ua	getty database
  /etc/group	\(ua	group data base
  /etc/hosts	\(ua	for local host information
! /etc/hosts.dir	*	must be rebuilt with /etc/mkhosts
! /etc/hosts.pag	*	must be rebuilt with /etc/mkhosts
  /etc/hosts.equiv	\(ua	for local host equivalence information
  /etc/networks	\(ua	for local network information
  /etc/netstart	*	site dependent network startup script
  /etc/passwd	*	must be converted to shadow password file format
! /etc/passwd.dir	*	must be rebuilt with /etc/mkpasswd
! /etc/passwd.pag	*	must be rebuilt with /etc/mkpasswd
  /etc/printcap	\(ua	line printer database
  /etc/protocols	\(dd	in case you added any local protocols
  /etc/rc	*	for any local additions
--- 72,85 ----
  /etc/gettytab	\(ua	getty database
  /etc/group	\(ua	group data base
  /etc/hosts	\(ua	for local host information
! /etc/hosts.dir	*	must be rebuilt with mkhosts
! /etc/hosts.pag	*	must be rebuilt with mkhosts
  /etc/hosts.equiv	\(ua	for local host equivalence information
  /etc/networks	\(ua	for local network information
  /etc/netstart	*	site dependent network startup script
  /etc/passwd	*	must be converted to shadow password file format
! /etc/passwd.dir	*	must be rebuilt with mkpasswd
! /etc/passwd.pag	*	must be rebuilt with mkpasswd
  /etc/printcap	\(ua	line printer database
  /etc/protocols	\(dd	in case you added any local protocols
  /etc/rc	*	for any local additions
***************
*** 363,369 ****
  .PP
  Note, once your system is installed and running, you
  should make sure that you recompile and reinstall the directory
! \fIusr/src/etc/tzone\fP.  Read through the Makefile first, if you're
  not located on the West Coast you will have to change it.  This directory
  is an addition since 4.3BSD, and is intended to solve the Daylight
  Savings Time problems once and for all.
--- 363,369 ----
  .PP
  Note, once your system is installed and running, you
  should make sure that you recompile and reinstall the directory
! \fI/usr/src/share/zoneinfo\fP.  Read through the Makefile first, if you're
  not located on the West Coast you will have to change it.  This directory
  is an addition since 4.3BSD, and is intended to solve the Daylight
  Savings Time problems once and for all.
***************
*** 413,420 ****
  and
  .I /etc/aliases
  databases via the commands:
! .IR "/etc/mkpasswd /etc/passwd" ,
! .IR "/etc/mkhosts /etc/hosts" ,
  and
  .IR /usr/ucb/newaliases.
  .NH 3
--- 413,420 ----
  and
  .I /etc/aliases
  databases via the commands:
! .IR "mkpasswd /etc/passwd" ,
! .IR "mkhosts /etc/hosts" ,
  and
  .IR /usr/ucb/newaliases.
  .NH 3
*** /usr/doc/2.10/setup.2.11/4.t.old	Thu Oct 24 21:39:23 1996
--- /usr/doc/2.10/setup.2.11/4.t	Wed Nov 27 20:00:04 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)4.t	2.3 (2.11BSD GTE) 1996/10/24
  .\"
  .de IR
  \fI\\$1\fP\|\\$2
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)4.t	2.3 (2.11BSD GTE) 1996/11/27
  .\"
  .de IR
  \fI\\$1\fP\|\\$2
***************
*** 483,489 ****
  Then, enable the appropriate lines of /etc/ttys by setting the ``status''
  field to \fBon\fP (or add new lines).
  Note that lines in \fI/etc/ttys\fP are one-for-one with entries
! in the file of current users (\fI/etc/utmp\fP),
  and therefore it is best to make changes
  while running in single-user mode
  and to add all of the entries for a new device at once.
--- 483,489 ----
  Then, enable the appropriate lines of /etc/ttys by setting the ``status''
  field to \fBon\fP (or add new lines).
  Note that lines in \fI/etc/ttys\fP are one-for-one with entries
! in the file of current users (\fI/var/run/utmp\fP),
  and therefore it is best to make changes
  while running in single-user mode
  and to add all of the entries for a new device at once.
***************
*** 504,513 ****
  quotes.
  Thus a newly added terminal /dev/tty00 could be added as
  .DS
! tty00 	"/etc/getty std.9600"	vt100	on secure	# Steve's office
  .DE
  The std.9600 parameter provided
! to /etc/getty is used in searching the file /etc/gettytab; it specifies
  a terminal's characteristics (such as baud rate).
  To make custom terminal types, consult 
  .IR gettytab (5)
--- 504,513 ----
  quotes.
  Thus a newly added terminal /dev/tty00 could be added as
  .DS
! tty00 	"/usr/libexec/getty std.9600"	vt100	on secure	# Steve's office
  .DE
  The std.9600 parameter provided
! to /usr/libexec/getty is used in searching the file /etc/gettytab; it specifies
  a terminal's characteristics (such as baud rate).
  To make custom terminal types, consult 
  .IR gettytab (5)
***************
*** 546,552 ****
  .PP
  Note that if a special file is inaccessible when \fIinit\fP tries
  to create a process for it, init will log a message to the
! system error logging process (/etc/syslogd)
  and try to reopen the terminal every minute, reprinting the warning
  message every 10 minutes.  Messages of this sort are normally
  printed on the console, though other actions may occur depending
--- 546,552 ----
  .PP
  Note that if a special file is inaccessible when \fIinit\fP tries
  to create a process for it, init will log a message to the
! system error logging process (/usr/sbin/syslogd)
  and try to reopen the terminal every minute, reprinting the warning
  message every 10 minutes.  Messages of this sort are normally
  printed on the console, though other actions may occur depending
***************
*** 618,624 ****
  /etc/aliases	mail forwarding information
  /usr/bin/newaliases	command to rebuild binary forwarding database
  /usr/ucb/biff	mail notification enabler\(ua
! /etc/comsat	mail notification daemon\(ua
  .TE
  .DE
  Mail is normally sent and received using the
--- 618,624 ----
  /etc/aliases	mail forwarding information
  /usr/bin/newaliases	command to rebuild binary forwarding database
  /usr/ucb/biff	mail notification enabler\(ua
! /usr/libexec/comsat	mail notification daemon\(ua
  .TE
  .DE
  Mail is normally sent and received using the
***************
*** 634,640 ****
  Local mail is delivered by giving it to the program /bin/mail
  that adds it to the mailboxes in the directory /usr/spool/mail/\fIusername\fP,
  using a locking protocol to avoid problems with simultaneous updates.
! After the mail is delivered, the local mail delivery daemon /etc/comsat
  is notified, which in turn notifies
  users who have issued a ``\fIbiff\fP y'' command that mail has arrived\(ua.
  .FS
--- 634,640 ----
  Local mail is delivered by giving it to the program /bin/mail
  that adds it to the mailboxes in the directory /usr/spool/mail/\fIusername\fP,
  using a locking protocol to avoid problems with simultaneous updates.
! After the mail is delivered, the local mail delivery daemon /usr/libexec/comsat
  is notified, which in turn notifies
  users who have issued a ``\fIbiff\fP y'' command that mail has arrived\(ua.
  .FS
*** /usr/doc/2.10/setup.2.11/5.t.old	Thu Nov 14 19:54:04 1996
--- /usr/doc/2.10/setup.2.11/5.t	Sat Nov 16 17:27:02 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)5.t	2.4 (2.11BSD GTE) 1996/11/14
  .\"
  .ds lq ``
  .ds rq ''
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)5.t	2.5 (2.11BSD GTE) 1996/11/16
  .\"
  .ds lq ``
  .ds rq ''
***************
*** 232,238 ****
  of the local part have been reserved for defining subnetworks;
  consequently the /etc/rc.local file contains lines of the form
  .DS
! /etc/ifconfig en0 netmask 0xffffff00 128.32.1.7
  .DE
  This specifies that for interface ``en0'', the upper 24 bits of
  the Internet address should be used in calculating network numbers
--- 232,238 ----
  of the local part have been reserved for defining subnetworks;
  consequently the /etc/rc.local file contains lines of the form
  .DS
! ifconfig en0 netmask 0xffffff00 128.32.1.7
  .DE
  This specifies that for interface ``en0'', the upper 24 bits of
  the Internet address should be used in calculating network numbers
***************
*** 270,276 ****
  attached to your host you will need to set up routing information
  to allow packets to be properly routed.  Two schemes are
  supported by the system.  The first scheme
! employs the routing table management daemon \fI/etc/routed\fP
  to maintain the system routing tables.  The routing daemon
  uses a variant of the Xerox Routing Information Protocol
  to maintain up to date routing tables in a cluster of local
--- 270,276 ----
  attached to your host you will need to set up routing information
  to allow packets to be properly routed.  Two schemes are
  supported by the system.  The first scheme
! employs the routing table management daemon \fIrouted\fP
  to maintain the system routing tables.  The routing daemon
  uses a variant of the Xerox Routing Information Protocol
  to maintain up to date routing tables in a cluster of local
***************
*** 297,303 ****
  redirect information to dynamically create a routing data
  base.  This is done by adding an entry of the form
  .DS
! /etc/route add default \fIsmart-gateway\fP 1
  .DE
  to \fI/etc/rc.local\fP; see
  .IR route (8)
--- 297,303 ----
  redirect information to dynamically create a routing data
  base.  This is done by adding an entry of the form
  .DS
! route add default \fIsmart-gateway\fP 1
  .DE
  to \fI/etc/rc.local\fP; see
  .IR route (8)
***************
*** 352,358 ****
  .PP
  In \*(2B most of the server programs are started up by a
  ``super server'', the Internet daemon.  The Internet
! daemon, \fI/usr/sbin/inetd\fP, acts as a master server for
  programs specified in its configuration file, \fI/etc/inetd.conf\fP,
  listening for service requests for these servers, and starting
  up the appropriate program whenever a request is received.
--- 352,358 ----
  .PP
  In \*(2B most of the server programs are started up by a
  ``super server'', the Internet daemon.  The Internet
! daemon, \fIinetd\fP, acts as a master server for
  programs specified in its configuration file, \fI/etc/inetd.conf\fP,
  listening for service requests for these servers, and starting
  up the appropriate program whenever a request is received.
***************
*** 369,379 ****
  For example, an entry for the file
  transfer protocol server would appear as
  .DS
! ftp	stream	tcp	nowait	root	/etc/ftpd	ftpd -l
  .DE
  or if you are using the \fItcp_wrapper\fP program as
  .DS
! ftp	stream	tcp	nowait	root	/etc/tcpd	ftpd -l
  .DE
  Consult
  .IR inetd (8)
--- 369,379 ----
  For example, an entry for the file
  transfer protocol server would appear as
  .DS
! ftp	stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -l
  .DE
  or if you are using the \fItcp_wrapper\fP program as
  .DS
! ftp	stream	tcp	nowait	root	/usr/libexec/tcpd	ftpd -l
  .DE
  Consult
  .IR inetd (8)
***************
*** 502,518 ****
  l l l.
  Program	Server	Started by
  _
! /etc/rshd	shell server	inetd
! /etc/rexecd	exec server	inetd
! /etc/rlogind	login server	inetd
! /etc/telnetd	TELNET server	inetd
! /etc/ftpd	FTP server	inetd
! /etc/fingerd	Finger server	inetd
! /etc/tftpd	TFTP server	inetd
! /etc/rwhod	system status daemon	/etc/rc
! /etc/syslogd	error logging server	/etc/rc
! /usr/sbin/sendmail	SMTP server	/etc/rc
! /etc/routed	routing table management daemon	/etc/rc
  .TE
  .DE
  Consult the manual pages and accompanying documentation (particularly
--- 502,518 ----
  l l l.
  Program	Server	Started by
  _
! rshd	shell server	inetd
! rexecd	exec server	inetd
! rlogind	login server	inetd
! telnetd	TELNET server	inetd
! ftpd	FTP server	inetd
! fingerd	Finger server	inetd
! tftpd	TFTP server	inetd
! rwhod	system status daemon	/etc/rc
! syslogd	error logging server	/etc/rc
! sendmail	SMTP server	/etc/rc
! routed	routing table management daemon	/etc/rc
  .TE
  .DE
  Consult the manual pages and accompanying documentation (particularly
***************
*** 524,531 ****
  commands similar to the following should be placed in the site dependent
  file \fI/etc/rc.local\fP.
  .DS
! if [ -f /etc/rwhod ]; then
! 	/etc/rwhod & echo -n ' rwhod'			>/dev/console
  f\&i
  .DE
  .NH 3
--- 524,531 ----
  commands similar to the following should be placed in the site dependent
  file \fI/etc/rc.local\fP.
  .DS
! if [ -f /usr/sbin/rwhod ]; then
! 	rwhod & echo -n ' rwhod'			>/dev/console
  f\&i
  .DE
  .NH 3
*** /usr/doc/2.10/setup.2.11/6.t.old	Thu Oct 24 21:42:26 1996
--- /usr/doc/2.10/setup.2.11/6.t	Sat Nov 16 17:29:07 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)6.t	2.3 (2.11BSD GTE) 1996/10/24
  .\"
  .de IR
  \fI\\$1\fP\|\\$2
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)6.t	2.4 (2.11BSD GTE) 1996/11/16
  .\"
  .de IR
  \fI\\$1\fP\|\\$2
***************
*** 83,89 ****
  should do this by:
  .DS
  \fB#\fP cd /
! \fB#\fP /etc/umount -a
  \fB#\fP ^D
  .DE
  .PP
--- 83,89 ----
  should do this by:
  .DS
  \fB#\fP cd /
! \fB#\fP umount -a
  \fB#\fP ^D
  .DE
  .PP
***************
*** 369,375 ****
  If you need to recharge for computing time, you can develop
  procedures based on the information provided by these commands.
  A convenient way to do this is to give commands to the clock daemon
! .I /etc/cron
  to be executed every day at a specified time.  This is done by adding
  lines to \fI/usr/adm/crontab\fP; see
  .IR cron (8)
--- 369,375 ----
  If you need to recharge for computing time, you can develop
  procedures based on the information provided by these commands.
  A convenient way to do this is to give commands to the clock daemon
! .I cron
  to be executed every day at a specified time.  This is done by adding
  lines to \fI/usr/adm/crontab\fP; see
  .IR cron (8)
*** /usr/doc/misc/berknet/netintro.n.old	Sat Mar  8 14:07:21 1980
--- /usr/doc/misc/berknet/netintro.n	Fri Nov 29 20:11:02 1996
***************
*** 12,18 ****
  Berkeley, California 94720
  .sp
  May 1979
! (revised March 1980)
  .AB
  This document describes the use of a network
  between a number of
--- 12,18 ----
  Berkeley, California 94720
  .sp
  May 1979
! (revised November 1996)
  .AB
  This document describes the use of a network
  between a number of
***************
*** 1007,1013 ****
  The
  .I net
  command has to read the password file, ``.netrc'' file and the
! ``/etc/utmp'' file.
  .IP f)
  The queue files are normally sent shortest-job first.
  Unfortunately, under heavy loading the queue-search becomes
--- 1007,1013 ----
  The
  .I net
  command has to read the password file, ``.netrc'' file and the
! ``/var/run/utmp'' file.
  .IP f)
  The queue files are normally sent shortest-job first.
  Unfortunately, under heavy loading the queue-search becomes
*** /usr/doc/smm/01.setup/2.t.old	Thu Oct 24 22:00:24 1996
--- /usr/doc/smm/01.setup/2.t	Sat Nov 16 17:32:13 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)2.t	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .ds lq ``
  .ds rq ''
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)2.t	6.1.2 (2.11BSD) 1996/11/16
  .\"
  .ds lq ``
  .ds rq ''
***************
*** 60,66 ****
  after bringing up \*(4B.
  If you select the latter tack,
  a version of the 4.1BSD dump program that runs under \*(4B is
! provided in \fI/etc/dump.4.1\fP.
  Beware that file systems created under \*(4B can
  use about 5-10% more disk space for file system related information
  than under 4.1BSD.  Thus, before dumping each file system it is
--- 60,66 ----
  after bringing up \*(4B.
  If you select the latter tack,
  a version of the 4.1BSD dump program that runs under \*(4B is
! provided as \fIdump.4.1\fP.
  Beware that file systems created under \*(4B can
  use about 5-10% more disk space for file system related information
  than under 4.1BSD.  Thus, before dumping each file system it is
***************
*** 763,769 ****
  To use the /usr file system, you should now remount it by
  saying
  .DS
! \fB#\fP /etc/mount /dev/${name} /usr
  .DE
  You can then extract the source code for the commands
  (except on RK07's and RM03's this will fit in the /usr file system):
--- 763,769 ----
  To use the /usr file system, you should now remount it by
  saying
  .DS
! \fB#\fP mount /dev/${name} /usr
  .DE
  You can then extract the source code for the commands
  (except on RK07's and RM03's this will fit in the /usr file system):
*** /usr/doc/smm/01.setup/4.t.old	Fri Nov  1 19:40:33 1996
--- /usr/doc/smm/01.setup/4.t	Wed Nov 27 20:03:03 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)4.t	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .de IR
  \fI\\$1\fP\|\\$2
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)4.t	6.1.2 (2.11BSD) 1996/11/16
  .\"
  .de IR
  \fI\\$1\fP\|\\$2
***************
*** 762,768 ****
  Then, enable the appropriate lines of /etc/ttys by setting the ``status''
  field to \fBon\fP (or add new lines).
  Note that lines in \fI/etc/ttys\fP are one-for-one with entries
! in the file of current users (\fI/etc/utmp\fP),
  and therefore it is best to make changes
  while running in single-user mode
  and to add all of the entries for a new device at once.
--- 762,768 ----
  Then, enable the appropriate lines of /etc/ttys by setting the ``status''
  field to \fBon\fP (or add new lines).
  Note that lines in \fI/etc/ttys\fP are one-for-one with entries
! in the file of current users (\fI/var/run/utmp\fP),
  and therefore it is best to make changes
  while running in single-user mode
  and to add all of the entries for a new device at once.
***************
*** 783,792 ****
  quotes.
  Thus a newly added terminal /dev/tty00 could be added as
  .DS
! tty00 	"/etc/getty std.9600"	vt100	on secure	# mike's office
  .DE
  The std.9600 parameter provided
! to /etc/getty is used in searching the file /etc/gettytab; it specifies
  a terminal's characteristics (such as baud rate).
  To make custom terminal types, consult 
  .IR gettytab (5)
--- 783,792 ----
  quotes.
  Thus a newly added terminal /dev/tty00 could be added as
  .DS
! tty00 	"/usr/libexec/getty std.9600"	vt100	on secure	# mike's office
  .DE
  The std.9600 parameter provided
! to /usr/libexec/getty is used in searching the file /etc/gettytab; it specifies
  a terminal's characteristics (such as baud rate).
  To make custom terminal types, consult 
  .IR gettytab (5)
***************
*** 830,836 ****
  .PP
  Note that if a special file is inaccessible when \fIinit\fP tries
  to create a process for it, init will log a message to the
! system error logging process (/etc/syslogd)
  and try to reopen the terminal every minute, reprinting the warning
  message every 10 minutes.  Messages of this sort are normally
  printed on the console, though other actions may occur depending
--- 830,836 ----
  .PP
  Note that if a special file is inaccessible when \fIinit\fP tries
  to create a process for it, init will log a message to the
! system error logging process (/usr/sbin/syslogd)
  and try to reopen the terminal every minute, reprinting the warning
  message every 10 minutes.  Messages of this sort are normally
  printed on the console, though other actions may occur depending
***************
*** 966,972 ****
  /etc/aliases	mail forwarding information
  /usr/bin/newaliases	command to rebuild binary forwarding database
  /usr/ucb/biff	mail notification enabler
! /etc/comsat	mail notification daemon
  .TE
  .DE
  Mail is normally sent and received using the
--- 966,972 ----
  /etc/aliases	mail forwarding information
  /usr/bin/newaliases	command to rebuild binary forwarding database
  /usr/ucb/biff	mail notification enabler
! /usr/libexec/comsat	mail notification daemon
  .TE
  .DE
  Mail is normally sent and received using the
***************
*** 982,988 ****
  Local mail is delivered by giving it to the program /bin/mail
  that adds it to the mailboxes in the directory /usr/spool/mail/\fIusername\fP,
  using a locking protocol to avoid problems with simultaneous updates.
! After the mail is delivered, the local mail delivery daemon /etc/comsat
  is notified, which in turn notifies
  users who have issued a ``\fIbiff\fP y'' command that mail has arrived.
  .PP
--- 982,988 ----
  Local mail is delivered by giving it to the program /bin/mail
  that adds it to the mailboxes in the directory /usr/spool/mail/\fIusername\fP,
  using a locking protocol to avoid problems with simultaneous updates.
! After the mail is delivered, the local mail delivery daemon /usr/libexec/comsat
  is notified, which in turn notifies
  users who have issued a ``\fIbiff\fP y'' command that mail has arrived.
  .PP
*** /usr/doc/smm/01.setup/5.t.old	Thu Nov 14 19:57:00 1996
--- /usr/doc/smm/01.setup/5.t	Sat Nov 16 17:39:13 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)5.t	6.1.2 (2.11BSD) 1996/11/14
  .\"
  .ds lq ``
  .ds rq ''
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)5.t	6.1.3 (2.11BSD) 1996/11/16
  .\"
  .ds lq ``
  .ds rq ''
***************
*** 184,190 ****
  of the local part have been reserved for defining subnetworks;
  consequently the /etc/rc.local file contains lines of the form
  .DS
! /etc/ifconfig en0 netmask 0xffffff00 128.32.1.7
  .DE
  This specifies that for interface ``en0'', the upper 24 bits of
  the Internet address should be used in calculating network numbers
--- 184,190 ----
  of the local part have been reserved for defining subnetworks;
  consequently the /etc/rc.local file contains lines of the form
  .DS
! ifconfig en0 netmask 0xffffff00 128.32.1.7
  .DE
  This specifies that for interface ``en0'', the upper 24 bits of
  the Internet address should be used in calculating network numbers
***************
*** 222,228 ****
  attached to your host you will need to set up routing information
  to allow packets to be properly routed.  Two schemes are
  supported by the system.  The first scheme
! employs the routing table management daemon \fI/etc/routed\fP
  to maintain the system routing tables.  The routing daemon
  uses a variant of the Xerox Routing Information Protocol
  to maintain up to date routing tables in a cluster of local
--- 222,228 ----
  attached to your host you will need to set up routing information
  to allow packets to be properly routed.  Two schemes are
  supported by the system.  The first scheme
! employs the routing table management daemon \fIrouted\fP
  to maintain the system routing tables.  The routing daemon
  uses a variant of the Xerox Routing Information Protocol
  to maintain up to date routing tables in a cluster of local
***************
*** 249,255 ****
  redirect information to dynamically create a routing data
  base.  This is done by adding an entry of the form
  .DS
! /etc/route add default \fIsmart-gateway\fP 1
  .DE
  to \fI/etc/rc.local\fP; see
  .IR route (8C)
--- 249,255 ----
  redirect information to dynamically create a routing data
  base.  This is done by adding an entry of the form
  .DS
! route add default \fIsmart-gateway\fP 1
  .DE
  to \fI/etc/rc.local\fP; see
  .IR route (8C)
***************
*** 344,350 ****
  For example, an entry for the file
  transfer protocol server would appear as
  .DS
! ftp	stream	tcp	nowait	root	/etc/ftpd	ftpd
  .DE
  Consult
  .IR inetd (8c)
--- 344,350 ----
  For example, an entry for the file
  transfer protocol server would appear as
  .DS
! ftp	stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd
  .DE
  Consult
  .IR inetd (8c)
***************
*** 392,398 ****
  The full host and network name data bases are normally derived from
  a file retrieved from the Internet Network Information Center at
  SRI.
! To do this you should use the program /etc/gettable
  to retrieve the NIC host data base, and the program
  .IR htable (8)
  to convert it to the format used by the libraries.
--- 392,398 ----
  The full host and network name data bases are normally derived from
  a file retrieved from the Internet Network Information Center at
  SRI.
! To do this you should use the program \fIgettable\fP
  to retrieve the NIC host data base, and the program
  .IR htable (8)
  to convert it to the format used by the libraries.
***************
*** 399,409 ****
  You should change to the directory where you maintain your local
  additions to the host table and execute the following commands.
  .DS
! \fB#\fP /etc/gettable sri-nic.arpa
  \fBConnection to sri-nic.arpa opened.\fP
  \fBHost table received.\fP
  \fBConnection to sri-nic.arpa closed.\fP
! \fB#\fP /etc/htable hosts.txt
  \fBWarning, no localgateways file.\fP
  \fB#\fP
  .DE
--- 399,409 ----
  You should change to the directory where you maintain your local
  additions to the host table and execute the following commands.
  .DS
! \fB#\fP gettable sri-nic.arpa\fP
  \fBConnection to sri-nic.arpa opened.\fP
  \fBHost table received.\fP
  \fBConnection to sri-nic.arpa closed.\fP
! \fB#\fP htable hosts.txt
  \fBWarning, no localgateways file.\fP
  \fB#\fP
  .DE
***************
*** 487,503 ****
  l l l.
  Program	Server	Started by
  _
! /etc/rshd	shell server	inetd
! /etc/rexecd	exec server	inetd
! /etc/rlogind	login server	inetd
! /etc/telnetd	TELNET server	inetd
! /etc/ftpd	FTP server	inetd
! /etc/fingerd	Finger server	inetd
! /etc/tftpd	TFTP server	inetd
! /etc/rwhod	system status daemon	/etc/rc
! /etc/syslogd	error logging server	/etc/rc
! /usr/sbin/sendmail	SMTP server	/etc/rc
! /etc/routed	routing table management daemon	/etc/rc
  .TE
  .DE
  Consult the manual pages and accompanying documentation (particularly
--- 487,503 ----
  l l l.
  Program	Server	Started by
  _
! rshd	shell server	inetd
! rexecd	exec server	inetd
! rlogind	login server	inetd
! telnetd	TELNET server	inetd
! ftpd	FTP server	inetd
! fingerd	Finger server	inetd
! tftpd	TFTP server	inetd
! rwhod	system status daemon	/etc/rc
! syslogd	error logging server	/etc/rc
! sendmail	SMTP server	/etc/rc
! routed	routing table management daemon	/etc/rc
  .TE
  .DE
  Consult the manual pages and accompanying documentation (particularly
***************
*** 509,516 ****
  commands of the following sort should be placed in the site dependent
  file \fI/etc/rc.local\fP.
  .DS
! if [ -f /etc/routed ]; then
! 	/etc/routed & echo -n ' routed'			>/dev/console
  f\&i
  .DE
  .NH 3
--- 509,516 ----
  commands of the following sort should be placed in the site dependent
  file \fI/etc/rc.local\fP.
  .DS
! if [ -f /usr/sbin/routed ]; then
! 	routed & echo -n ' routed'			>/dev/console
  f\&i
  .DE
  .NH 3
*** /usr/doc/smm/01.setup/6.t.old	Thu Oct 24 22:06:28 1996
--- /usr/doc/smm/01.setup/6.t	Sat Nov 16 17:41:01 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)6.t	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .de IR
  \fI\\$1\fP\|\\$2
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)6.t	6.1.2 (2.11BSD) 1996/11/16
  .\"
  .de IR
  \fI\\$1\fP\|\\$2
***************
*** 111,117 ****
  should do this by:
  .DS
  \fB#\fP cd /
! \fB#\fP /etc/umount -a
  \fB#\fP ^D
  .DE
  .PP
--- 111,117 ----
  should do this by:
  .DS
  \fB#\fP cd /
! \fB#\fP umount -a
  \fB#\fP ^D
  .DE
  .PP
***************
*** 466,472 ****
  If you need to recharge for computing time, you can develop
  procedures based on the information provided by these commands.
  A convenient way to do this is to give commands to the clock daemon
! .I /etc/cron
  to be executed every day at a specified time.  This is done by adding
  lines to \fI/usr/adm/crontab\fP; see
  .IR cron (8)
--- 466,472 ----
  If you need to recharge for computing time, you can develop
  procedures based on the information provided by these commands.
  A convenient way to do this is to give commands to the clock daemon
! .I cron
  to be executed every day at a specified time.  This is done by adding
  lines to \fI/usr/adm/crontab\fP; see
  .IR cron (8)
*** /usr/doc/smm/01.setup/a.t.old	Thu Oct 24 22:07:07 1996
--- /usr/doc/smm/01.setup/a.t	Sat Nov 16 17:44:24 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)a.t	6.1.1 (2.11BSD) 1996/10/24
  .\"
  .de IR
  \fI\\$1\fP\|\\$2
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)a.t	6.1.2 (2.11BSD) 1996/11/16
  .\"
  .de IR
  \fI\\$1\fP\|\\$2
***************
*** 125,140 ****
  rm -rf usr; mkdir usr usr/mdec
  rm -rf sys; mkdir sys sys/floppy sys/cassette sys/consolerl
  cp $DISTROOT/etc/disktab etc
! cp $DISTROOT/etc/newfs etc; strip etc/newfs
! cp $DISTROOT/etc/mkfs etc; strip etc/mkfs
! cp $DISTROOT/etc/restore etc; strip etc/restore
  cp $DISTROOT/etc/init etc; strip etc/init
! cp $DISTROOT/etc/mount etc; strip etc/mount
! cp $DISTROOT/etc/mknod etc; strip etc/mknod
! cp $DISTROOT/etc/fsck etc; strip etc/fsck
! cp $DISTROOT/etc/umount etc; strip etc/umount
! cp $DISTROOT/etc/arff etc; strip etc/arff
! cp $DISTROOT/etc/flcopy etc; strip etc/flcopy
  cp $DISTROOT/bin/mt bin; strip bin/mt
  cp $DISTROOT/bin/ls bin; strip bin/ls
  cp $DISTROOT/bin/sh bin; strip bin/sh
--- 125,140 ----
  rm -rf usr; mkdir usr usr/mdec
  rm -rf sys; mkdir sys sys/floppy sys/cassette sys/consolerl
  cp $DISTROOT/etc/disktab etc
! cp $DISTROOT/sbin/newfs etc; strip sbin/newfs
! cp $DISTROOT/sbin/mkfs etc; strip sbin/mkfs
! cp $DISTROOT/sbin/restore etc; strip sbin/restore
  cp $DISTROOT/etc/init etc; strip etc/init
! cp $DISTROOT/sbin/mount etc; strip sbin/mount
! cp $DISTROOT/sbin/mknod etc; strip sbin/mknod
! cp $DISTROOT/sbin/fsck etc; strip sbin/fsck
! cp $DISTROOT/sbin/umount etc; strip sbin/umount
! cp $DISTROOT/usr/sbin/arff etc; strip usr/sbin/arff
! cp $DISTROOT/usr/sbin/flcopy etc; strip usr/sbin/flcopy
  cp $DISTROOT/bin/mt bin; strip bin/mt
  cp $DISTROOT/bin/ls bin; strip bin/ls
  cp $DISTROOT/bin/sh bin; strip bin/sh
***************
*** 250,256 ****
  eval dd if=/dev/r${miniroot} count=205 bs=20b conv=sync ${remote+'|'} \e
  	${remote-"of=$tape"} ${remote+'/usr/local/20b ">" $tape'}
  echo "Add full dump of real file system"
! /etc/${remote+r}dump 0uf $remote${remote+:}${tape} /c/nbsd
  echo "Add tar image of /usr"
  cd /nbsd/usr; eval tar cf ${tartape} adm bin dict doc games \e
  	guest hosts include lib local man mdec msgs new \e
--- 250,256 ----
  eval dd if=/dev/r${miniroot} count=205 bs=20b conv=sync ${remote+'|'} \e
  	${remote-"of=$tape"} ${remote+'/usr/local/20b ">" $tape'}
  echo "Add full dump of real file system"
! ${remote+r}dump 0uf $remote${remote+:}${tape} /c/nbsd
  echo "Add tar image of /usr"
  cd /nbsd/usr; eval tar cf ${tartape} adm bin dict doc games \e
  	guest hosts include lib local man mdec msgs new \e
*** /usr/doc/smm/04.quotas/quotas.ms.old	Tue May 13 15:01:10 1986
--- /usr/doc/smm/04.quotas/quotas.ms	Sat Nov 16 17:46:22 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)quotas	6.1 (Berkeley) 5/13/86
  .\"
  .EH 'SMM:4-%''Disc Quotas in a \s-2UNIX\s+2 Environment'
  .OH 'Disc Quotas in a \s-2UNIX\s+2 Environment''SMM:4-%'
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)quotas	6.1.1 (2.11BSD) 1996/11/16
  .\"
  .EH 'SMM:4-%''Disc Quotas in a \s-2UNIX\s+2 Environment'
  .OH 'Disc Quotas in a \s-2UNIX\s+2 Environment''SMM:4-%'
***************
*** 179,185 ****
  Most sites using the quota system, will include the
  line
  .DS C
! /etc/quotaon -a
  .DE
  in \fB/etc/rc.local\fP.
  .PP
--- 179,185 ----
  Most sites using the quota system, will include the
  line
  .DS C
! quotaon -a
  .DE
  in \fB/etc/rc.local\fP.
  .PP
***************
*** 275,281 ****
  .PP
  A later system was implemented at the University of Melbourne
  by the author, but was not kept highly accurately, eg:
! chown's (etc) did not affect quotas, nor did i/o to a file
  other than one owned by the instigator.
  .PP
  The current system has been running (with only minor modifications)
--- 275,281 ----
  .PP
  A later system was implemented at the University of Melbourne
  by the author, but was not kept highly accurately, eg:
! chown's, (etc) did not affect quotas, nor did i/o to a file
  other than one owned by the instigator.
  .PP
  The current system has been running (with only minor modifications)
*** /usr/doc/smm/05.fsck/2.t.old	Sat Feb  1 20:20:06 1986
--- /usr/doc/smm/05.fsck/2.t	Sat Nov 16 17:47:48 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)2.t	4.3 (Berkeley) 2/1/86
  .\"
  .ds RH Overview of the file system
  .NH
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)2.t	4.3.1 (2.11BSD) 1996/11/16
  .\"
  .ds RH Overview of the file system
  .NH
***************
*** 206,212 ****
  when a
  .I sync (2)
  is done (at 30 second intervals) by
! .I "/etc/update" "(8),"
  or by manual operator intervention with the
  .I sync (8)
  command.
--- 206,212 ----
  when a
  .I sync (2)
  is done (at 30 second intervals) by
! .I "update" "(8),"
  or by manual operator intervention with the
  .I sync (8)
  command.
*** /usr/doc/smm/08.timedop/timed.ms.old	Fri May 23 18:31:36 1986
--- /usr/doc/smm/08.timedop/timed.ms	Sat Nov 16 17:49:11 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)timed.ms	6.1 (Berkeley) 5/23/86
  .\"
  .TL
  Timed Installation and Operation Guide
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)timed.ms	6.1.1 (2.11BSD) 1996/11/16
  .\"
  .TL
  Timed Installation and Operation Guide
***************
*** 149,155 ****
  There are some limitations to the current
  implementation of the time daemon.
  It is expected that these limitations will be removed in future releases.
! The constant NHOSTS in /usr/src/etc/timed/globals.h limits the
  maximum number of machines that may be directly controlled by one
  master time daemon.
  The current maximum is 29 (NHOSTS \- 1).
--- 149,155 ----
  There are some limitations to the current
  implementation of the time daemon.
  It is expected that these limitations will be removed in future releases.
! The constant NHOSTS in /usr/src/usr.sbin/timed/globals.h limits the
  maximum number of machines that may be directly controlled by one
  master time daemon.
  The current maximum is 29 (NHOSTS \- 1).
***************
*** 184,191 ****
  .sp 2
  .in 1i
  .nf
! if [ -f /etc/timed ]; then
! 	/etc/timed \fIflags\fP & echo -n ' timed' >/dev/console
  fi
  .fi
  .in -1i
--- 184,191 ----
  .sp 2
  .in 1i
  .nf
! if [ -f /usr/sbin/timed ]; then
! 	timed \fIflags\fP & echo -n ' timed' >/dev/console
  fi
  .fi
  .in -1i
*** /usr/doc/smm/11.named/build.me.old	Sun Feb 28 23:59:40 1988
--- /usr/doc/smm/11.named/build.me	Sat Nov 16 17:50:53 1996
***************
*** 8,14 ****
  .\" software without specific prior written permission. This software
  .\" is provided ``as is'' without express or implied warranty.
  .\"
! .\"	@(#)build.me	6.2 (Berkeley) 2/28/88
  .\"
  .sh 1 "Building A System with a Name Server"
  .pp
--- 8,14 ----
  .\" software without specific prior written permission. This software
  .\" is provided ``as is'' without express or implied warranty.
  .\"
! .\"	@(#)build.me	6.2.1 (2.11BSD) 1996/11/16
  .\"
  .sh 1 "Building A System with a Name Server"
  .pp
***************
*** 52,58 ****
  The basic function of the name server is to provide information about network
  objects by answering queries.  The specifications for this name server
  are defined in RFC882, RFC883, RFC973 and RFC974.
! These documents can be found in \fI/usr/src/etc/named/doc\fP in 4.3BSD 
  or \fIftp\fPed from sri-nic.arpa. It is also recommeded that 
  you read the related
  manual pages,  \fInamed\fP\|(8),
--- 52,58 ----
  The basic function of the name server is to provide information about network
  objects by answering queries.  The specifications for this name server
  are defined in RFC882, RFC883, RFC973 and RFC974.
! These documents can be found in \fI/usr/src/usr.sbin/named/doc\fP
  or \fIftp\fPed from sri-nic.arpa. It is also recommeded that 
  you read the related
  manual pages,  \fInamed\fP\|(8),
*** /usr/doc/smm/11.named/manage.me.old	Sun Feb 28 23:59:41 1988
--- /usr/doc/smm/11.named/manage.me	Sat Nov 16 17:52:05 1996
***************
*** 8,14 ****
  .\" software without specific prior written permission. This software
  .\" is provided ``as is'' without express or implied warranty.
  .\"
! .\"	@(#)manage.me	6.5 (Berkeley) 2/28/88
  .\"
  .sh 1 "Domain Management"
  .pp
--- 8,14 ----
  .\" software without specific prior written permission. This software
  .\" is provided ``as is'' without express or implied warranty.
  .\"
! .\"	@(#)manage.me	6.5.1 (2.11BSD) 1996/11/16
  .\"
  .sh 1 "Domain Management"
  .pp
***************
*** 21,28 ****
  The following entry should be added to \fI/etc/rc.local\fP to start
  up \fInamed\fP at system boot time:
  .(b l 
! \fIif [ -f /etc/named ]; then
! 	/etc/named\fP [options] \fI& echo -n ' named'	>/dev/console\fP
  \fIfi\fP
  .)b
  This usually directly follows the lines that start \fIsyslogd\fP.
--- 21,28 ----
  The following entry should be added to \fI/etc/rc.local\fP to start
  up \fInamed\fP at system boot time:
  .(b l 
! \fIif [ -f /usr/sbin/named ]; then
! 	named\fP [options] \fI& echo -n ' named'	>/dev/console\fP
  \fIfi\fP
  .)b
  This usually directly follows the lines that start \fIsyslogd\fP.
***************
*** 29,38 ****
  \fBDo Not\fP attempt to run \fInamed\fP from \fIinetd\fP.
  This will
  continuously restart the name server and defeat the purpose of having a cache.
! .sh 2 /etc/named.pid
  .pp
  When \fInamed\fP is successfully started up it writes its process id
! into the file \fI/etc/named.pid\fP.  This is useful to programs
  that want to send signals to \fInamed\fP. The name of this file may be changed
  by defining \fIPIDFILE\fP to the new name when compiling \fInamed\fP.
  .sh 2 /etc/hosts
--- 29,38 ----
  \fBDo Not\fP attempt to run \fInamed\fP from \fIinetd\fP.
  This will
  continuously restart the name server and defeat the purpose of having a cache.
! .sh 2 /var/run/named.pid
  .pp
  When \fInamed\fP is successfully started up it writes its process id
! into the file \fI/var/run/named.pid\fP.  This is useful to programs
  that want to send signals to \fInamed\fP. The name of this file may be changed
  by defining \fIPIDFILE\fP to the new name when compiling \fInamed\fP.
  .sh 2 /etc/hosts
*** /usr/doc/smm/12.uchanges/1.t.old	Tue Apr 15 15:27:41 1986
--- /usr/doc/smm/12.uchanges/1.t	Wed Nov 27 20:04:49 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)1.t	6.12 (Berkeley) 4/15/86
  .\"
  .sp
  .ce
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)1.t	6.12.1 (2.11BSD) 1996/11/27
  .\"
  .sp
  .ce
***************
*** 960,966 ****
  can still be used during the conversion.
  .I Talkd
  looks for a writable terminal instead of giving up if a user's
! first entry in \fI/etc/utmp\fP is not writable.
  Root may always interrupt.
  .I Talk
  now runs set-group-id to group \fItty\fP so that it is no longer
--- 960,966 ----
  can still be used during the conversion.
  .I Talkd
  looks for a writable terminal instead of giving up if a user's
! first entry in \fI/var/run/utmp\fP is not writable.
  Root may always interrupt.
  .I Talk
  now runs set-group-id to group \fItty\fP so that it is no longer
***************
*** 1067,1073 ****
  A new program that provides multiple windows on ASCII terminals.
  .BP write
  Looks for a writable terminal instead of giving up if a user's
! first entry in \fI/etc/utmp\fP is not writable.
  Root may always interrupt.
  Non-printable escape sequences can no longer be sent
  to an unsuspecting user's terminal.
--- 1067,1073 ----
  A new program that provides multiple windows on ASCII terminals.
  .BP write
  Looks for a writable terminal instead of giving up if a user's
! first entry in \fI/var/run/utmp\fP is not writable.
  Root may always interrupt.
  Non-printable escape sequences can no longer be sent
  to an unsuspecting user's terminal.
*** /usr/doc/smm/12.uchanges/5.t.old	Mon Apr 14 12:32:11 1986
--- /usr/doc/smm/12.uchanges/5.t	Sat Nov 16 17:53:49 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)5.t	6.4 (Berkeley) 4/14/86
  .\"
  .SH
  .LG
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)5.t	6.4.1 (2.11BSD) 1996/11/16
  .\"
  .SH
  .LG
***************
*** 37,43 ****
  The format of the ttys file, \fI/etc/ttys\fP,
  reflects the merger of information previously kept in \fI/etc/ttys\fP,
  \fI/etc/securetty\fP, and \fI/etc/ttytype\fP.
! The new format permits arbitrary programs, not just \fI/etc/getty\fP,
  to be spawned by \fIinit\fP.
  A special \fBwindow\fP field can be used to
  set up a window server before spawning a terminal emulator program.
--- 37,43 ----
  The format of the ttys file, \fI/etc/ttys\fP,
  reflects the merger of information previously kept in \fI/etc/ttys\fP,
  \fI/etc/securetty\fP, and \fI/etc/ttytype\fP.
! The new format permits arbitrary programs, not just \fIgetty\fP,
  to be spawned by \fIinit\fP.
  A special \fBwindow\fP field can be used to
  set up a window server before spawning a terminal emulator program.
*** /usr/doc/usd/08.mh/ADMIN.me.old	Thu Oct 24 22:40:38 1996
--- /usr/doc/usd/08.mh/ADMIN.me	Wed Nov 27 20:06:48 1996
***************
*** 434,441 ****
  .sp
  .nf
  .in +.5i
! if [ \-f /etc/popd ]; then
!     /etc/popd & echo \-n ' pop'			>/dev/console
  fi
  .in \-.5i
  .fi
--- 434,441 ----
  .sp
  .nf
  .in +.5i
! if [ \-f /usr/libexec/popd ]; then
!     /usr/libexec/popd & echo \-n ' pop'			>/dev/console
  fi
  .in \-.5i
  .fi
*** /usr/doc/usd/08.mh/popd.me.old	Mon Apr 14 16:04:50 1986
--- /usr/doc/usd/08.mh/popd.me	Wed Nov 27 20:09:30 1996
***************
*** 3,9 ****
  .NA
  popd \- the POP server
  .SY
! /etc/popd
  \%[\-p\ portno]
  (under /etc/rc.local)
  .DE
--- 3,9 ----
  .NA
  popd \- the POP server
  .SY
! /usr/libexec/popd
  \%[\-p\ portno]
  (under /etc/rc.local)
  .DE
*** /usr/include/paths.h.old	Mon Oct 21 19:50:59 1996
--- /usr/include/paths.h	Wed Nov 27 20:11:50 1996
***************
*** 14,20 ****
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.3.6 (2.11BSD) 1996/10/21
   */
  
  #define	_PATH_BSHELL	"/bin/sh"
--- 14,20 ----
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.3.7 (2.11BSD) 1996/11/27
   */
  
  #define	_PATH_BSHELL	"/bin/sh"
***************
*** 26,31 ****
--- 26,32 ----
  #define	_PATH_DEVNULL	"/dev/null"
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_DEV	"/dev"
+ #define	_PATH_NOLOGIN	"/etc/nologin"
  #define	_PATH_LASTLOG	"/usr/adm/lastlog"
  #define	_PATH_TMP	"/tmp/"
  #define	_PATH_VARTMP	"/usr/tmp/"
*** /usr/include/pwd.h.old	Sun May 14 22:34:24 1989
--- /usr/include/pwd.h	Sat Nov 16 17:56:22 1996
***************
*** 14,25 ****
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pwd.h	4.3 (Berkeley) 2/22/89
   */
  
  #define	_PATH_PASSWD		"/etc/passwd"
  #define	_PATH_MASTERPASSWD	"/etc/master.passwd"
! #define	_PATH_MKPASSWD		"/etc/mkpasswd"
  #define	_PATH_PTMP		"/etc/ptmp"
  
  #define	_PW_KEYBYNAME		'0'
--- 14,25 ----
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pwd.h	4.3.1 (2.11BSD) 1996/11/16
   */
  
  #define	_PATH_PASSWD		"/etc/passwd"
  #define	_PATH_MASTERPASSWD	"/etc/master.passwd"
! #define	_PATH_MKPASSWD		"/sbin/mkpasswd"
  #define	_PATH_PTMP		"/etc/ptmp"
  
  #define	_PW_KEYBYNAME		'0'
*** /usr/include/sysexits.h.old	Fri Sep 16 22:51:54 1988
--- /usr/include/sysexits.h	Fri Nov 29 20:12:18 1996
***************
*** 9,15 ****
   * software without specific prior written permission. This software
   * is provided ``as is'' without express or implied warranty.
   *
!  *	@(#)sysexits.h	4.4 (Berkeley) 3/24/88
   */
  
  /*
--- 9,15 ----
   * software without specific prior written permission. This software
   * is provided ``as is'' without express or implied warranty.
   *
!  *	@(#)sysexits.h	4.4.1 (2.11BSD) 1996/11/29
   */
  
  /*
***************
*** 51,57 ****
  **		fork", "cannot create pipe", or the like.  It includes
  **		things like getuid returning a user that does not
  **		exist in the passwd file.
! **	EX_OSFILE -- Some system file (e.g., /etc/passwd, /etc/utmp,
  **		etc.) does not exist, cannot be opened, or has some
  **		sort of error (e.g., syntax error).
  **	EX_CANTCREAT -- A (user specified) output file cannot be
--- 51,57 ----
  **		fork", "cannot create pipe", or the like.  It includes
  **		things like getuid returning a user that does not
  **		exist in the passwd file.
! **	EX_OSFILE -- Some system file (e.g., /etc/passwd, /var/run/utmp,
  **		etc.) does not exist, cannot be opened, or has some
  **		sort of error (e.g., syntax error).
  **	EX_CANTCREAT -- A (user specified) output file cannot be
*** /usr/include/tzfile.h.old	Mon Mar 30 17:57:20 1987
--- /usr/include/tzfile.h	Fri Nov 29 20:14:25 1996
***************
*** 1,5 ****
  /*
!  *	@(#)tzfile.h	5.2 tzfile.h 3/4/87
   */
  
  /*
--- 1,5 ----
  /*
!  *	@(#)tzfile.h	5.2.1 (2.11BSD) 1996/11/29
   */
  
  /*
***************
*** 6,13 ****
  ** Information about time zone files.
  */
  
! #define	TZDIR		"/etc/zoneinfo"	/* Time zone object file directory */
! #define	TZDEFAULT	"localtime"
  
  /*
  ** Each file begins with. . .
--- 6,14 ----
  ** Information about time zone files.
  */
  
! 			/* Time zone object file directory */
! #define	TZDIR		"/usr/share/zoneinfo"
! #define	TZDEFAULT	"/etc/localtime"
  
  /*
  ** Each file begins with. . .
*** /usr/include/utmp.h.old	Sun May  9 16:24:46 1993
--- /usr/include/utmp.h	Wed Nov 27 20:12:57 1996
***************
*** 14,23 ****
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)utmp.h	5.6 (2.11BSD) 5/9/93
   */
  
! #define	_PATH_UTMP	"/etc/utmp"
  #define	_PATH_WTMP	"/usr/adm/wtmp"
  
  #define	UT_NAMESIZE	15
--- 14,23 ----
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)utmp.h	5.6.1 (2.11BSD) 1996/11/27
   */
  
! #define	_PATH_UTMP	"/var/run/utmp"
  #define	_PATH_WTMP	"/usr/adm/wtmp"
  
  #define	UT_NAMESIZE	15
*** /usr/ingres/doc/other/lockdev.nr.old	Wed Apr 26 22:59:06 1995
--- /usr/ingres/doc/other/lockdev.nr	Sat Nov 16 17:56:55 1996
***************
*** 361,367 ****
  Execute the command:
  
  .nf
! 	/etc/mknod  /dev/ingreslock  c  major  0
  
  .fi
  where "major" is the major device number.
--- 361,367 ----
  Execute the command:
  
  .nf
! 	mknod  /dev/ingreslock  c  major  0
  
  .fi
  where "major" is the major device number.
*** /usr/src/bin/Makefile.old	Fri Jun  9 22:51:36 1995
--- /usr/src/bin/Makefile	Sat Nov 16 20:46:19 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.19.7 (2.11BSD GTE) 1995/06/09
  #
  DESTDIR=
  CFLAGS=	-O
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.19.8 (2.11BSD GTE) 1996/11/16
  #
  DESTDIR=
  CFLAGS=	-O
***************
*** 12,18 ****
  # Programs that live in subdirectories, and have makefiles of their own.
  #
  SUBDIR=	adb ar as awk chflags chpass csh diff disklabel hostname ld login \
! 	ls make nm passwd sed sh sysctl test tp
  
  # Shell scripts that need only be installed and are never removed.
  #
--- 12,18 ----
  # Programs that live in subdirectories, and have makefiles of their own.
  #
  SUBDIR=	adb ar as awk chflags chpass csh diff disklabel hostname ld login \
! 	ls make nm passwd ping sed sh sysctl test tp
  
  # Shell scripts that need only be installed and are never removed.
  #
*** /usr/src/bin/chpass/Makefile.old	Sat Jan 27 23:30:47 1996
--- /usr/src/bin/chpass/Makefile	Sun Dec  1 14:44:12 1996
***************
*** 14,24 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.1.1 (2.11BSD) 1996/1/27
  #
  CFLAGS=	-I. -O
  SEPFLAG= -i
- LIBC=	/lib/libc.a
  SRCS=	chpass.c field.c util.c
  OBJS=	chpass.o field.o util.o
  MAN=	chpass.0
--- 14,23 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.1.2 (2.11BSD) 1996/12/1
  #
  CFLAGS=	-I. -O
  SEPFLAG= -i
  SRCS=	chpass.c field.c util.c
  OBJS=	chpass.o field.o util.o
  MAN=	chpass.0
***************
*** 26,32 ****
  
  all: chpass ${MAN}
  
! chpass: ${LIBC} ${OBJS}
  	${CC} ${CFLAGS} ${SEPFLAG} -o $@ ${OBJS}
  
  chpass.0: ${MANSRC}
--- 25,31 ----
  
  all: chpass ${MAN}
  
! chpass: ${OBJS}
  	${CC} ${CFLAGS} ${SEPFLAG} -o $@ ${OBJS}
  
  chpass.0: ${MANSRC}
*** /usr/src/bin/csh/Makefile.old	Sat Sep 21 20:36:13 1996
--- /usr/src/bin/csh/Makefile	Sun Dec  1 14:45:34 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley Software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.3.2 (2.11BSD GTE) 1996/9/20
  #
  # C Shell with process control; VM/UNIX VAX Makefile
  # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
--- 3,9 ----
  # All rights reserved.  The Berkeley Software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.3.3 (2.11BSD GTE) 1996/12/1
  #
  # C Shell with process control; VM/UNIX VAX Makefile
  # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
***************
*** 19,25 ****
  CXREF=	/usr/ucb/cxref
  VGRIND=	/usr/ucb/vgrind
  CTAGS=	/usr/ucb/ctags
! LIBES=  /lib/libc.a
  SCCS=	sccs
  CPP=	/lib/cpp
  SED=	sed
--- 19,25 ----
  CXREF=	/usr/ucb/cxref
  VGRIND=	/usr/ucb/vgrind
  CTAGS=	/usr/ucb/ctags
! LIBES=  -lc
  SCCS=	sccs
  CPP=	/lib/cpp
  SED=	sed
*** /usr/src/bin/login/Makefile.old	Sun Jan 28 19:57:02 1996
--- /usr/src/bin/login/Makefile	Sun Dec  1 14:45:56 1996
***************
*** 14,24 ****
  # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
  # FITNESS FOR A PARTICULAR PURPOSE.
  #
! # @(#)Makefile	5.3.1 (2.11BSD) 1996/1/28
  #
  
  CFLAGS=	-O -i
- LIBC=	/lib/libc.a
  SRCS=	login.c
  OBJS=	login.o
  MAN=
--- 14,23 ----
  # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
  # FITNESS FOR A PARTICULAR PURPOSE.
  #
! # @(#)Makefile	5.3.2 (2.11BSD) 1996/12/1
  #
  
  CFLAGS=	-O -i
  SRCS=	login.c
  OBJS=	login.o
  MAN=
***************
*** 25,31 ****
  
  all: login
  
! login: ${LIBC} ${OBJS}
  	${CC} -o $@ ${CFLAGS} ${OBJS} -lutil
  
  clean:
--- 24,30 ----
  
  all: login
  
! login: ${OBJS}
  	${CC} -o $@ ${CFLAGS} ${OBJS} -lutil
  
  clean: