diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2002-06-09 06:15:16 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2002-06-09 06:15:16 +0000 |
| commit | adea637ba2ffdae4f3941cdd150a7cda541c73d5 (patch) | |
| tree | 85a8568276014cb312d880d74d26a967aaa247aa /etc | |
| parent | 92e441e5118d285594af4b0ef964f51d1df97920 (diff) | |
rm trailing whitespace
Diffstat (limited to 'etc')
71 files changed, 217 insertions, 217 deletions
diff --git a/etc/afs/CellServDB b/etc/afs/CellServDB index a281fa543cc..46d02635b31 100644 --- a/etc/afs/CellServDB +++ b/etc/afs/CellServDB @@ -380,8 +380,8 @@ 171.64.7.222 #afsdb1.stanford.edu 171.64.7.234 #afsdb2.stanford.edu 171.64.7.246 #afsdb3.stanford.edu ->olympia.stanford.edu # Stanford DECathena AFS cell - local -36.53.0.106 #olympia.stanford.edu +>olympia.stanford.edu # Stanford DECathena AFS cell - local +36.53.0.106 #olympia.stanford.edu >slac.stanford.edu # Stanford Linear Accelerator Center 134.79.18.25 #afsdb1.slac.stanford.edu 134.79.18.26 #afsdb2.slac.stanford.edu @@ -561,7 +561,7 @@ >lngs.infn.it # INFN, Laboratori Nazionali di Gran Sasso, Italia 192.84.135.3 #rsgs02.lngs.infn.it >pi.infn.it # INFN Sezione di Pisa -192.84.133.7 #aix.pi.infn.it +192.84.133.7 #aix.pi.infn.it 192.84.133.50 #aix1.pi.infn.it >dis.uniroma1.it # DIS, Univ. "La Sapienza", Rome, area Buonarotti 151.100.5.21 #peano.dis.uniroma1.it diff --git a/etc/afs/afsd.conf b/etc/afs/afsd.conf index 19852be7305..9eab9b8e701 100644 --- a/etc/afs/afsd.conf +++ b/etc/afs/afsd.conf @@ -1,7 +1,7 @@ # # Arla conffile # -# $OpenBSD: afsd.conf,v 1.3 1998/09/28 18:25:20 ian Exp $ +# $OpenBSD: afsd.conf,v 1.4 2002/06/09 06:15:14 todd Exp $ # # The upper limit of (arlad) vnodes (think files and directories) # (high-water mark) diff --git a/etc/etc.alpha/disktab b/etc/etc.alpha/disktab index 6eac7590da7..4d594b1b451 100644 --- a/etc/etc.alpha/disktab +++ b/etc/etc.alpha/disktab @@ -1,4 +1,4 @@ -# $OpenBSD: disktab,v 1.13 2001/05/16 00:35:33 deraadt Exp $ +# $OpenBSD: disktab,v 1.14 2002/06/09 06:15:14 todd Exp $ # $NetBSD: disktab,v 1.2 1995/10/13 03:09:39 cgd Exp $ # A DEC RZ25, configured so that all of the free partition IDs are at diff --git a/etc/etc.amiga/MAKEDEV.md b/etc/etc.amiga/MAKEDEV.md index 739bed34db5..daa725daa9c 100644 --- a/etc/etc.amiga/MAKEDEV.md +++ b/etc/etc.amiga/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.8 2002/05/16 21:11:20 miod Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.9 2002/06/09 06:15:14 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org> @@ -138,7 +138,7 @@ mouse*) 0|1) M mouse$U c 15 $U if [ $U = 0 ] - then + then MKlist="$MKlist;rm -f mouse; ln -s mouse$U mouse" fi ;; diff --git a/etc/etc.amiga/disktab b/etc/etc.amiga/disktab index cab0a98366e..6eee9467580 100644 --- a/etc/etc.amiga/disktab +++ b/etc/etc.amiga/disktab @@ -1,8 +1,8 @@ # -# $OpenBSD: disktab,v 1.12 2001/01/19 15:01:24 jj Exp $ +# $OpenBSD: disktab,v 1.13 2002/06/09 06:15:14 todd Exp $ # $NetBSD: disktab,v 1.4 1995/11/28 05:40:23 jtc Exp $ # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # dt controller type # ty type of disk (fixed, removeable, simulated) diff --git a/etc/etc.amiga/ttys b/etc/etc.amiga/ttys index 92c69887851..dd8dc857ca3 100644 --- a/etc/etc.amiga/ttys +++ b/etc/etc.amiga/ttys @@ -1,11 +1,11 @@ # -# $OpenBSD: ttys,v 1.8 2002/05/30 06:46:13 deraadt Exp $ +# $OpenBSD: ttys,v 1.9 2002/06/09 06:15:14 todd Exp $ # # name getty type status comments # # If the console is marked insecure, single-user requires # the root password. -console "/usr/libexec/getty Pc" vt220 off secure +console "/usr/libexec/getty Pc" vt220 off secure ttye0 "/usr/libexec/getty Pc" vt220 on secure # custom chips ttye1 "/usr/libexec/getty Pc" vt220 on secure # retina ttye2 "/usr/libexec/getty Pc" vt220 on secure # retina diff --git a/etc/etc.hp300/disktab b/etc/etc.hp300/disktab index feeccbde040..f8a13b7a268 100644 --- a/etc/etc.hp300/disktab +++ b/etc/etc.hp300/disktab @@ -1,9 +1,9 @@ -# $OpenBSD: disktab,v 1.5 1997/05/01 09:32:56 deraadt Exp $ +# $OpenBSD: disktab,v 1.6 2002/06/09 06:15:14 todd Exp $ # $NetBSD: disktab,v 1.3 1995/09/30 21:57:48 thorpej Exp $ # # @(#)disktab 5.5 (Berkeley) 2/27/91 # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # ty type of disk # ns #sectors/track diff --git a/etc/etc.hp300/ttys b/etc/etc.hp300/ttys index 20aea347ac5..71c3d707c90 100644 --- a/etc/etc.hp300/ttys +++ b/etc/etc.hp300/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.5 1998/06/28 03:26:58 todd Exp $ +# $OpenBSD: ttys,v 1.6 2002/06/09 06:15:14 todd Exp $ # # name getty type status comments # diff --git a/etc/etc.hppa/disktab b/etc/etc.hppa/disktab index b9e730053c1..ecaff8d5550 100644 --- a/etc/etc.hppa/disktab +++ b/etc/etc.hppa/disktab @@ -1,8 +1,8 @@ -# $OpenBSD: disktab,v 1.1 1999/11/30 21:25:38 mickey Exp $ +# $OpenBSD: disktab,v 1.2 2002/06/09 06:15:14 todd Exp $ # # @(#)disktab 5.5 (Berkeley) 2/27/91 # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # ty type of disk # ns #sectors/track diff --git a/etc/etc.hppa/ttys b/etc/etc.hppa/ttys index 393efff91fe..37fb4191e8b 100644 --- a/etc/etc.hppa/ttys +++ b/etc/etc.hppa/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.1 1999/11/30 21:25:39 mickey Exp $ +# $OpenBSD: ttys,v 1.2 2002/06/09 06:15:14 todd Exp $ # # name getty type status comments # diff --git a/etc/etc.i386/INSTALL.ata b/etc/etc.i386/INSTALL.ata index 0df3427b206..11c9c2b41bf 100644 --- a/etc/etc.i386/INSTALL.ata +++ b/etc/etc.i386/INSTALL.ata @@ -914,7 +914,7 @@ Basic Questions the retail market. - Hale Landis <landis@sugs.tware.com> /end part 1/ --- +-- \\===============\\=======================\\ \\ Hale Landis \\ 303-548-0567 \\ // Niwot, CO USA // landis@sugs.tware.com // diff --git a/etc/etc.i386/INSTALL.chs b/etc/etc.i386/INSTALL.chs index 99c4c1de896..e90cb5e40ec 100644 --- a/etc/etc.i386/INSTALL.chs +++ b/etc/etc.i386/INSTALL.chs @@ -882,7 +882,7 @@ BIOS Type 10 use this information. /end of part 2 of 2/ --- +-- \\===============\\=======================\\ \\ Hale Landis \\ 303-548-0567 \\ // Niwot, CO USA // landis@sugs.tware.com // diff --git a/etc/etc.i386/INSTALL.dbr b/etc/etc.i386/INSTALL.dbr index 52340f1e926..5fc13879a5b 100644 --- a/etc/etc.i386/INSTALL.dbr +++ b/etc/etc.i386/INSTALL.dbr @@ -460,7 +460,7 @@ The last two bytes contain a 55AAH signature. 0000:7Df0 ........ ........ ........ ....55aa * U.* /end/ --- +-- \\===============\\=======================\\ \\ Hale Landis \\ 303-548-0567 \\ // Niwot, CO USA // landis@sugs.tware.com // diff --git a/etc/etc.i386/INSTALL.linux b/etc/etc.i386/INSTALL.linux index c8fa434feea..c85c44be2a6 100644 --- a/etc/etc.i386/INSTALL.linux +++ b/etc/etc.i386/INSTALL.linux @@ -1,4 +1,4 @@ -$OpenBSD: INSTALL.linux,v 1.10 2001/04/18 14:22:20 aaron Exp $ +$OpenBSD: INSTALL.linux,v 1.11 2002/06/09 06:15:14 todd Exp $ Linux + OpenBSD: it's possible @@ -40,14 +40,14 @@ installation away. It is generally the case that you will install the machine, play with it for a week/a month, and find out that you don't like the setup, and then start over. -Write down any interesting information you find out during your first +Write down any interesting information you find out during your first installation. Don't do too many things to your box during the first month, -as you will lose these while reinstalling, unless you can do backups +as you will lose these while reinstalling, unless you can do backups conveniently. Do you really need to have a dual-boot machines ? Most people don't need both Linux and OpenBSD. Once you're satisfied with OpenBSD, you may find -out you just want to erase Linux... +out you just want to erase Linux... Try to find out what your precise needs are, locate partitions whose size may change next to each other, as far as possible... Put partitions whose @@ -60,9 +60,9 @@ temporary file instead of a partition, under both OpenBSD (svnd) and Linux. First principles ---------------- OpenBSD doesn't only use the MBR partitions (the ones mapped in the Master -Boot Record) for booting. Afterwards, it trusts some bsd specific -information called the disklabel, which is another completely distinct -description of your hard disk. It does not even have to be consistent with +Boot Record) for booting. Afterwards, it trusts some bsd specific +information called the disklabel, which is another completely distinct +description of your hard disk. It does not even have to be consistent with the usual DOS partitions information. [OpenBSD requires a primary MBR partition for booting, anything else is officially unsupported.] @@ -111,7 +111,7 @@ BTW, just enough for /bin /sbin, a kernel and /etc). Mapping your disk ----------------- Starting from Linux, get a grasp of your partitions. Use df to check which -is what, then fdisk to get the actual setup of the disk. +is what, then fdisk to get the actual setup of the disk. Write down the setup onto a bit of paper, in case you make a mistake further down. It can come in very handy. @@ -163,12 +163,12 @@ match) There are some differences though, mostly because Linux fdisk has made some rather confusing choices: -- in simple mode it starts numbering cylinders at 1... whereas +- in simple mode it starts numbering cylinders at 1... whereas everything else starts from 0. - in simple mode it shows blocks of 1024 bytes, which makes for half-blocks (marked with a +) and sizes halved from the real block size. -- in expert mode it shows extended partitions offset from the start -of the extended partition. +- in expert mode it shows extended partitions offset from the start +of the extended partition. - the hd/sec/cyl is a confusing order, as the sector number is computed from cyl/hd/sec, in that order. - it never shows and doesn't care about the real disk geometry. @@ -177,7 +177,7 @@ You will notice that I don't have a linux swap partition visible. My linux setup currently uses the OpenBSD swap area. Before starting to install OpenBSD, now would be a good time to check the -INSTALL.pt document... Especially note the alignment restriction of +INSTALL.pt document... Especially note the alignment restriction of partitions (first sector of a partition must be at head 0, sector 1 of a cylinder). This is enforced by Linux' fdisk. @@ -186,15 +186,15 @@ lists. This will show up in OpenBSD's fdisk. Your clock and OpenBSD ---------------------- -OpenBSD expects your hardware clock to be in universal time, and uses -time zones to give you local time. With Linux, this depends... -most distributions use a small program called hwclock to set up the -system time from the hardware clock when booting... there is a --utc -option if your hardware clock is in universal time, but this is not +OpenBSD expects your hardware clock to be in universal time, and uses +time zones to give you local time. With Linux, this depends... +most distributions use a small program called hwclock to set up the +system time from the hardware clock when booting... there is a --utc +option if your hardware clock is in universal time, but this is not always what happens by default. -For instance, on a redhat system, up to 5.2, this happens in -/etc/rc.d/rc.sysinit which loads an /etc/sysconfig/clock that defines a +For instance, on a redhat system, up to 5.2, this happens in +/etc/rc.d/rc.sysinit which loads an /etc/sysconfig/clock that defines a variable called UTC, and then proceeds calling hwclock. - ensure UTC is set to true, - adjust your hardware clock from the system time if necessary, e.g., @@ -205,11 +205,11 @@ lets you do: set your hardware clock to GMT. The Linux partition table and OpenBSD ------------------------------------- -There used to be a problem with Linux's rc: it always mounts all file systems +There used to be a problem with Linux's rc: it always mounts all file systems even in single-user mode. The 2.2 kernels fix that in a handy way: the -partition recorded in the MBR is scanned for a disklabel, and marked with -a ! if one is found. Then, the rest of the disk is scanned, before -coming back to the disklabel itself. That way, changes to the +partition recorded in the MBR is scanned for a disklabel, and marked with +a ! if one is found. Then, the rest of the disk is scanned, before +coming back to the disklabel itself. That way, changes to the OpenBSD disklabel won't affect the setup of the rest of the disk. Anyhow, you may want to check that you can still boot from a Linux kernel @@ -220,10 +220,10 @@ inittab and rc scripts to make deadly sure that single-user boot will work The OpenBSD installation ------------------------ If you've got the space, you can install from your ext2fs partitions. This -is what I did, a long time in the past, as I had a slip connection to the +is what I did, a long time in the past, as I had a slip connection to the rest of the world, and the OpenBSD install floppy does not include slip. -REMEMBER TO BACKUP ALL IMPORTANT DATA ON YOUR DISK BEFORE DOING THE +REMEMBER TO BACKUP ALL IMPORTANT DATA ON YOUR DISK BEFORE DOING THE INSTALLATION !!! So you cp floppy*.fs /dev/fd0, then reboot from the floppy. @@ -239,17 +239,17 @@ Offset: 0 Signatures: 0xAA55,0x0 Starting Ending #: id cyl hd sec - cyl hd sec [ start - size] ------------------------------------------------------------------------- - 0: 06 0 1 1 - 210 127 63 [ 63 - 1701441] DOS > 32MB + 0: 06 0 1 1 - 210 127 63 [ 63 - 1701441] DOS > 32MB 1: 83 211 0 1 - 272 127 63 [ 1701504 - 499968] Linux files* - 2: A6 273 0 1 - 991 127 63 [ 2201472 - 5798016] OpenBSD - 3: 00 0 0 0 - 0 0 0 [ 0 - 0] unused + 2: A6 273 0 1 - 991 127 63 [ 2201472 - 5798016] OpenBSD + 3: 00 0 0 0 - 0 0 0 [ 0 - 0] unused -fdisk geometry tells me that I needn't worry about cylinder 1024. +fdisk geometry tells me that I needn't worry about cylinder 1024. This matches very closely with what linux fdisk saw. If you had extended partitions, it would be a trifle bit harder: -you just follow the extended partition links using select, jot down -whatever you need, add the OpenBSD partition into the MBR to look like +you just follow the extended partition links using select, jot down +whatever you need, add the OpenBSD partition into the MBR to look like you want it to, and save everything. The * at the end of partition #1 means that the system normally boots under @@ -265,21 +265,21 @@ OpenBSD partition that was declared in the MBR (what you just entered in fdisk, the `slice' from FreeBSD lingo). Most simple installation don't need to edit more than that, but you can use b 0 * to unlock the whole disk (this is a bad idea in most cases). -- your real disk geometry becomes more relevant. The Berkeley fast file system -can't use partial cylinder groups, hence BSD partitions should start +- your real disk geometry becomes more relevant. The Berkeley fast file system +can't use partial cylinder groups, hence BSD partitions should start on cylinder boundaries, as any remaining sectors will be lost anyway. (Actually, what's important is the disk geometry that disklabel gives you. -Trust it on that). In my case, sectors/cylinder=1008 and bytes/sector=512, +Trust it on that). In my case, sectors/cylinder=1008 and bytes/sector=512, so the granularity of disklabel partitions is 504 Kb. - units for size and offset can be given as sectors (default) or cylinders. After edition, this is what my disklabel looks like: -# editing +# editing # using MBR partition 2: type A6 off 2201472 (0x219780) size 5798016 (0x587880) # /dev/rwd0c: type: ESDI -disk: +disk: label: TOSHIBA MK4006M flags: bytes/sector: 512 @@ -294,7 +294,7 @@ trackskew: 0 cylinderskew: 0 headswitch: 0 # milliseconds track-to-track seek: 0 # milliseconds -drivedata: 0 +drivedata: 0 16 partitions: # size offset fstype [fsize bsize cpg] @@ -312,7 +312,7 @@ drivedata: 0 l: 1023120 3194352 4.2BSD 1024 8192 16 # (Cyl. 3169 - 4183) Things that check, more or less automatically: -- this disklabel is saved in MBR partition #2 (basic DOS partition 2), +- this disklabel is saved in MBR partition #2 (basic DOS partition 2), as expected. - all the BSD partitions proper are aligned on a cylinder boundary (ie no '*'). the root partition begins at the precise same offset the corresponding DOS @@ -332,25 +332,25 @@ And here is the corresponding /etc/fstab: /dev/wd0f /usr/obj ffs rw 1 2 /dev/wd0i /vbig ffs rw 1 2 /dev/wd0j /dos msdos rw 1 2 -/dev/wd0k /linux ext2fs rw -/dev/wd0b /tmp mfs rw +/dev/wd0k /linux ext2fs rw +/dev/wd0b /tmp mfs rw One point that is somewhat laborious is that the disklabel -E mode (which you are currently using) tends to move partitions around to ensure that ALL defined partitions are contiguous. For that reason, it is better if you don't have to use b 0 *, otherwise partitions will be moved around to remove holes, without regard for the rigid MBR partitioning. -ext2fs and DOS partitions should be recognized and positioned -automatically if all goes well. +ext2fs and DOS partitions should be recognized and positioned +automatically if all goes well. Once the disklabel is written to disk, the installation proceeds as usual. -ext2fs partitions are perfectly usable from OpenBSD. +ext2fs partitions are perfectly usable from OpenBSD. Booting ------- -First time I booted my system back, I did not get into OpenBSD as expected... -I plain forgot I had installed lilo in the master boot block, and lilo +First time I booted my system back, I did not get into OpenBSD as expected... +I plain forgot I had installed lilo in the master boot block, and lilo does not heed the active partition flag. The fix was rather simple: from the Linux system, I just had to edit lilo.conf to add the OpenBSD entry: @@ -389,7 +389,7 @@ your linux kernel to recognize BSD disklabels... Here is how it shows up on my box: Partition check: - hda: hda1 hda2 hda3! < hda5 hda6 hda7 hda8 hda9 hda10 hda11 hda12 hda13 hda14 + hda: hda1 hda2 hda3! < hda5 hda6 hda7 hda8 hda9 hda10 hda11 hda12 hda13 hda14 hda15 > - the disklabel is detected early, but handled later. @@ -408,7 +408,7 @@ and here is my linux fstab: /dev/hda9 /bsd/usr/obj ufs ufstype=44bsd 1 2 /dev/hda1 /dos vfat defaults 1 2 /dev/fd0 /mnt/floppy ext2 noauto 0 0 -/dev/cdrom /mnt/cdrom iso9660 noauto,ro +/dev/cdrom /mnt/cdrom iso9660 noauto,ro 2.2 kernels also include a working UFS, though you may run into problems when writing to ufs partitions. Note the ufstype=44bsd. If you forget that @@ -425,8 +425,8 @@ have to recompile anything, as this is the default setup. It's a good idea to mount your Linux file system under another point, then make symbolic links so that you can control what gets used precisely. -As you have a complete linux system, don't bother with the ports -emul/linux_lib entry: it's only a set of Linux libraries for people who +As you have a complete linux system, don't bother with the ports +emul/linux_lib entry: it's only a set of Linux libraries for people who don't have a Linux system running. A small detail that may cause problems: uname still says `OpenBSD', even @@ -442,7 +442,7 @@ class with Linux. Similar shell scripts are easy to fix. Binary programs that don't run suid can be coerced by using LD_PRELOAD. -As a rule, this should be achieved on a program-by-program basis. +As a rule, this should be achieved on a program-by-program basis. The more networking programs that do tell they're running under OpenBSD, the merrier ! @@ -454,7 +454,7 @@ swap partition (even though I have 32 Mb of memory, largely enough for the installation). Since it uses a 2.0.36 kernel, it does NOT handle BSD disklabels, so I couldn't tell it to use my swap area (I have this bad feeling that distributed 2.2 boot kernels won't include BSD disklabel -handling anyway). Instead, I had to back my last OpenBSD partition up, +handling anyway). Instead, I had to back my last OpenBSD partition up, fiddle with my fdisk setup to feed the last cylinder as a swap partition to their brain dead install CD. Then fetch the latest kernel source to the linux side, and recompile to get a fully working linux setup. Finally, @@ -484,13 +484,13 @@ you know what you are doing, and don't expect there will always be someone to get you out of trouble. If your setup is really too weird, no-one can help. As far as the boot process goes, I think lilo allows you to boot from ANY -partition recorded in the MBR, including extended partitions. The only +partition recorded in the MBR, including extended partitions. The only limitation is that the next stage bootstrap MUST take place entirely within the first 1024 cylinders of the disk, as seen by the BIOS. OpenBSD MBR partitions that extend beyond cylinder 1024 are no problem, as long as the disklabel root (a) partition doesn't extend beyond cylinder 1024. -Since Windows, OpenBSD, and linux all have that limitation, the easiest way +Since Windows, OpenBSD, and linux all have that limitation, the easiest way is to start with Windows partitions (entirely within the first 1024 cylinders), follow with the linux boot partition (still within the first 1024 cylinders), then the OpenBSD area (which can span the 1024 cylinders diff --git a/etc/etc.i386/INSTALL.mbr b/etc/etc.i386/INSTALL.mbr index 7a3cea7ef67..ebeaa0d04bf 100644 --- a/etc/etc.i386/INSTALL.mbr +++ b/etc/etc.i386/INSTALL.mbr @@ -264,7 +264,7 @@ The last two bytes contain a 55AAH signature. 0000:07f0 ........ ........ ........ ....55aa *..............U.* /end/ --- +-- \\===============\\=======================\\ \\ Hale Landis \\ 303-548-0567 \\ // Niwot, CO USA // landis@sugs.tware.com // diff --git a/etc/etc.i386/INSTALL.os2br b/etc/etc.i386/INSTALL.os2br index 71ba1a983c8..74f6b6a4bc3 100644 --- a/etc/etc.i386/INSTALL.os2br +++ b/etc/etc.i386/INSTALL.os2br @@ -462,7 +462,7 @@ The last two bytes contain a 55AAH signature. 0000:7Df0 ........ ........ ........ ....55aa * U.* /end/ --- +-- \\===============\\=======================\\ \\ Hale Landis \\ 303-548-0567 \\ // Niwot, CO USA // landis@sugs.tware.com // diff --git a/etc/etc.i386/INSTALL.pt b/etc/etc.i386/INSTALL.pt index 7642a6bc447..3918c992aa9 100644 --- a/etc/etc.i386/INSTALL.pt +++ b/etc/etc.i386/INSTALL.pt @@ -333,7 +333,7 @@ out that in V0 of this document I did not properly describe the unused sectors normally found around the partition table sectors. /end/ --- +-- \\===============\\=======================\\ \\ Hale Landis \\ 303-548-0567 \\ // Niwot, CO USA // landis@sugs.tware.com // diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab index da8dfcdad23..963a6497a68 100644 --- a/etc/etc.i386/disktab +++ b/etc/etc.i386/disktab @@ -1,6 +1,6 @@ -# $OpenBSD: disktab,v 1.14 2001/01/28 23:31:28 niklas Exp $ +# $OpenBSD: disktab,v 1.15 2002/06/09 06:15:14 todd Exp $ -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # dt controller type # ty type of disk (fixed, removeable, simulated) diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys index 7f6ed811c2f..6e150fd7019 100644 --- a/etc/etc.i386/ttys +++ b/etc/etc.i386/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.16 2001/02/11 19:14:05 aaron Exp $ +# $OpenBSD: ttys,v 1.17 2002/06/09 06:15:14 todd Exp $ # # name getty type status comments # diff --git a/etc/etc.mac68k/disktab b/etc/etc.mac68k/disktab index 007a8167d2d..eae5a22bda3 100644 --- a/etc/etc.mac68k/disktab +++ b/etc/etc.mac68k/disktab @@ -1,9 +1,9 @@ -# $OpenBSD: disktab,v 1.4 2002/04/24 22:33:41 miod Exp $ +# $OpenBSD: disktab,v 1.5 2002/06/09 06:15:14 todd Exp $ # $NetBSD: disktab,v 1.3 1995/09/30 21:57:48 thorpej Exp $ # # @(#)disktab 5.5 (Berkeley) 2/27/91 # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # ty type of disk # ns #sectors/track diff --git a/etc/etc.mac68k/ttys b/etc/etc.mac68k/ttys index 94d353940a3..0403b8e843f 100644 --- a/etc/etc.mac68k/ttys +++ b/etc/etc.mac68k/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.6 1998/06/28 03:26:59 todd Exp $ +# $OpenBSD: ttys,v 1.7 2002/06/09 06:15:14 todd Exp $ # # name getty type status comments # diff --git a/etc/etc.macppc/Makefile.inc b/etc/etc.macppc/Makefile.inc index 4241e0480fa..161a027da85 100644 --- a/etc/etc.macppc/Makefile.inc +++ b/etc/etc.macppc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2002/05/13 07:22:43 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2002/06/09 06:15:14 todd Exp $ # etc.macppc/Makefile.inc -- macppc-specific etc Makefile targets .ifdef DESTDIR @@ -11,7 +11,7 @@ bsd: cd ${.CURDIR}/../sys/arch/macppc/compile/GENERIC && \ ${MAKE} clean && ${MAKE} depend && exec ${MAKE} -# knows about bsd.rd +# knows about bsd.rd distrib1: cp ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/snapshot/ofwboot cp ${DESTDIR}/usr/mdec/bsd.tbxi ${DESTDIR}/snapshot/bsd.tbxi diff --git a/etc/etc.macppc/disktab b/etc/etc.macppc/disktab index 47bd4dbe8e0..85635956411 100644 --- a/etc/etc.macppc/disktab +++ b/etc/etc.macppc/disktab @@ -1,8 +1,8 @@ -# $OpenBSD: disktab,v 1.1 2001/09/01 16:13:48 drahn Exp $ +# $OpenBSD: disktab,v 1.2 2002/06/09 06:15:14 todd Exp $ # # @(#)disktab 5.5 (Berkeley) 2/27/91 # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # ty type of disk # ns #sectors/track diff --git a/etc/etc.macppc/ttys b/etc/etc.macppc/ttys index adab7b88cd6..2574f720e5e 100644 --- a/etc/etc.macppc/ttys +++ b/etc/etc.macppc/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.2 2001/09/27 22:49:59 drahn Exp $ +# $OpenBSD: ttys,v 1.3 2002/06/09 06:15:14 todd Exp $ # # name getty type status comments # diff --git a/etc/etc.mvme68k/disktab b/etc/etc.mvme68k/disktab index 29fef22ab59..97b85c1f598 100644 --- a/etc/etc.mvme68k/disktab +++ b/etc/etc.mvme68k/disktab @@ -1,9 +1,9 @@ -# $OpenBSD: disktab,v 1.5 2001/01/28 23:31:28 niklas Exp $ +# $OpenBSD: disktab,v 1.6 2002/06/09 06:15:14 todd Exp $ # # @(#)disktab 5.5 (Berkeley) 2/27/91 # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # ty type of disk # ns #sectors/track diff --git a/etc/etc.mvme88k/disktab b/etc/etc.mvme88k/disktab index 84fce0fd51b..6b919650e66 100644 --- a/etc/etc.mvme88k/disktab +++ b/etc/etc.mvme88k/disktab @@ -1,6 +1,6 @@ -# $OpenBSD: disktab,v 1.2 2001/01/28 23:31:29 niklas Exp $ +# $OpenBSD: disktab,v 1.3 2002/06/09 06:15:14 todd Exp $ -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # dt controller type # ty type of disk (fixed, removeable, simulated) diff --git a/etc/etc.mvme88k/ttys b/etc/etc.mvme88k/ttys index 68db4faec80..2cbd8b6e409 100644 --- a/etc/etc.mvme88k/ttys +++ b/etc/etc.mvme88k/ttys @@ -1,11 +1,11 @@ # -# $OpenBSD: ttys,v 1.3 1998/06/28 03:27:03 todd Exp $ +# $OpenBSD: ttys,v 1.4 2002/06/09 06:15:14 todd Exp $ # # name getty type status comments # # If the console is marked insecure, single-user requires # the root password. -console "/usr/libexec/getty Pc" unknown off secure +console "/usr/libexec/getty Pc" unknown off secure ttye0 "/usr/libexec/getty Pc" unknown on secure clocal ttye1 "/usr/libexec/getty Pc" unknown on ttye2 "/usr/libexec/getty Pc" unknown off diff --git a/etc/etc.mvmeppc/MAKEDEV.md b/etc/etc.mvmeppc/MAKEDEV.md index e99330edeb1..7bfcedb948b 100644 --- a/etc/etc.mvmeppc/MAKEDEV.md +++ b/etc/etc.mvmeppc/MAKEDEV.md @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV.md,v 1.6 2002/05/30 06:46:13 deraadt Exp $ +# $OpenBSD: MAKEDEV.md,v 1.7 2002/06/09 06:15:14 todd Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -21,7 +21,7 @@ # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # # from: @(#)MAKEDEV 5.2 (Berkeley) 6/22/90 -# $NetBSD: MAKEDEV,v 1.17 1996/02/03 15:02:42 briggs Exp $ +# $NetBSD: MAKEDEV,v 1.17 1996/02/03 15:02:42 briggs Exp $ # # Device "make" file. Valid arguments: _TITLE(make) @@ -231,7 +231,7 @@ st*) st*) name=st; chr=20; blk=5;; esac rm -f $name$unit n$name$unit e$name$unit en$name$unit \ - r$name$unit nr$name$unit er$name$unit enr$name$unit + r$name$unit nr$name$unit er$name$unit enr$name$unit case $unit in 0|1|2|3|4|5|6) mknod ${name}${unit} b $blk $(( $unit * 16 + 0 )) @@ -245,11 +245,11 @@ st*) chown root.operator ${name}${unit} n${name}${unit} \ e$name$unit en$name$unit \ r${name}${unit} nr${name}${unit} \ - er${name}${unit} enr${name}${unit} + er${name}${unit} enr${name}${unit} chmod 660 ${name}${unit} n${name}${unit} \ e$name$unit en$name$unit \ r${name}${unit} nr${name}${unit} \ - er${name}${unit} enr${name}${unit} + er${name}${unit} enr${name}${unit} ;; *) echo bad unit for tape in: $i @@ -363,12 +363,12 @@ utty*) chmod 660 utty$unit ;; - + ttyCcfg) major=67 minor=255 rm -f ttyCcfg - mknod ttyCcfg c $major $minor + mknod ttyCcfg c $major $minor chown root.wheel ttyCcfg ;; @@ -475,7 +475,7 @@ wsmux|wsmouse|wskbd) wskbd*) unit=${i##*[a-z]} - rm -f wskbd${unit} + rm -f wskbd${unit} mknod wskbd${unit} c 68 ${unit} # XXX chmod 660 wskbd${unit} @@ -483,7 +483,7 @@ wskbd*) ;; wsmouse*) unit=${i##*[a-z]} - rm -f wsmouse${unit} + rm -f wsmouse${unit} mknod wsmouse${unit} c 69 ${unit} # XXX chmod 660 wsmouse${unit} @@ -492,8 +492,8 @@ wsmouse*) xfs*) rm -f xfs$unit - mknod xfs$unit c 51 $unit - chmod 600 xfs$unit + mknod xfs$unit c 51 $unit + chmod 600 xfs$unit chown root.wheel xfs$unit ;; diff --git a/etc/etc.mvmeppc/disktab b/etc/etc.mvmeppc/disktab index 0f97f63a910..85635956411 100644 --- a/etc/etc.mvmeppc/disktab +++ b/etc/etc.mvmeppc/disktab @@ -1,8 +1,8 @@ -# $OpenBSD: disktab,v 1.1 2001/06/26 22:37:37 smurph Exp $ +# $OpenBSD: disktab,v 1.2 2002/06/09 06:15:14 todd Exp $ # # @(#)disktab 5.5 (Berkeley) 2/27/91 # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # ty type of disk # ns #sectors/track diff --git a/etc/etc.mvmeppc/ttys b/etc/etc.mvmeppc/ttys index 7edcc29c163..41598f08bc4 100644 --- a/etc/etc.mvmeppc/ttys +++ b/etc/etc.mvmeppc/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.1 2001/06/26 22:37:38 smurph Exp $ +# $OpenBSD: ttys,v 1.2 2002/06/09 06:15:14 todd Exp $ # # name getty type status comments # diff --git a/etc/etc.sparc/disktab b/etc/etc.sparc/disktab index 67e4aaf6010..612cab1c957 100644 --- a/etc/etc.sparc/disktab +++ b/etc/etc.sparc/disktab @@ -1,8 +1,8 @@ -# $OpenBSD: disktab,v 1.19 2001/09/21 05:43:42 deraadt Exp $ +# $OpenBSD: disktab,v 1.20 2002/06/09 06:15:14 todd Exp $ # # @(#)disktab 5.5 (Berkeley) 2/27/91 # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # ty type of disk # ns #sectors/track diff --git a/etc/etc.sparc/install.sh b/etc/etc.sparc/install.sh index 0fad69b8142..b90a782ab1d 100644 --- a/etc/etc.sparc/install.sh +++ b/etc/etc.sparc/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.4 1998/09/23 07:30:57 todd Exp $ +# $OpenBSD: install.sh,v 1.5 2002/06/09 06:15:14 todd Exp $ # XXX should handle --unlink diff --git a/etc/etc.sparc/ttys b/etc/etc.sparc/ttys index da135914f39..d6f6458cc9a 100644 --- a/etc/etc.sparc/ttys +++ b/etc/etc.sparc/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.6 1999/02/01 00:34:25 jason Exp $ +# $OpenBSD: ttys,v 1.7 2002/06/09 06:15:14 todd Exp $ # # name getty type status comments # diff --git a/etc/etc.sparc64/disktab b/etc/etc.sparc64/disktab index b33c2c499c4..0cb96d13cbb 100644 --- a/etc/etc.sparc64/disktab +++ b/etc/etc.sparc64/disktab @@ -1,8 +1,8 @@ -# $OpenBSD: disktab,v 1.6 2001/10/12 18:54:32 jason Exp $ +# $OpenBSD: disktab,v 1.7 2002/06/09 06:15:15 todd Exp $ # # @(#)disktab 5.5 (Berkeley) 2/27/91 # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # ty type of disk # ns #sectors/track diff --git a/etc/etc.sparc64/ttys b/etc/etc.sparc64/ttys index c55f74df495..fa0568191ad 100644 --- a/etc/etc.sparc64/ttys +++ b/etc/etc.sparc64/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.4 2002/02/06 18:11:07 marc Exp $ +# $OpenBSD: ttys,v 1.5 2002/06/09 06:15:15 todd Exp $ # # name getty type status comments # diff --git a/etc/etc.sun3/MAKEDEV.md b/etc/etc.sun3/MAKEDEV.md index a13077f9c98..e61b6a32037 100644 --- a/etc/etc.sun3/MAKEDEV.md +++ b/etc/etc.sun3/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.7 2002/05/16 21:11:21 miod Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.8 2002/06/09 06:15:15 todd Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org> @@ -39,7 +39,7 @@ _DEV(cd, 58, 18) _DEV(xy, 9, 3) _DEV(xd, 42, 10) _TITLE(term) -_DEV(tzs, 12) +_DEV(tzs, 12) dnl _DEV(czs, 12) _TITLE(pty) _DEV(tty, 20) diff --git a/etc/etc.sun3/README b/etc/etc.sun3/README index 06a325d862e..f1738f6d8de 100644 --- a/etc/etc.sun3/README +++ b/etc/etc.sun3/README @@ -1,4 +1,4 @@ -# $OpenBSD: README,v 1.3 2000/05/01 02:24:11 miod Exp $ -*- text -*- +# $OpenBSD: README,v 1.4 2002/06/09 06:15:15 todd Exp $ -*- text -*- OpenBSD/Sun3 Binary Snapshot @@ -46,5 +46,5 @@ please contact the Sun3 portmaster: <miod@openbsd.org> I'm sorry this port isn't in good shape to be really usable now, but it will mature over the next few months. Enjoy anyway! --- +-- Miod Vallat diff --git a/etc/etc.sun3/disktab b/etc/etc.sun3/disktab index 1c2bfd509ad..d1a93be64da 100644 --- a/etc/etc.sun3/disktab +++ b/etc/etc.sun3/disktab @@ -1,8 +1,8 @@ # -# $OpenBSD: disktab,v 1.6 2000/06/19 01:52:09 miod Exp $ +# $OpenBSD: disktab,v 1.7 2002/06/09 06:15:15 todd Exp $ # $NetBSD: disktab,v 1.3 1995/11/21 20:58:33 gwr Exp $ # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # dt controller type # ty type of disk (fixed, removeable, simulated) diff --git a/etc/etc.sun3/install.sh b/etc/etc.sun3/install.sh index 4bc6fed2d2a..ad5111ca455 100644 --- a/etc/etc.sun3/install.sh +++ b/etc/etc.sun3/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.2 1998/09/23 07:30:58 todd Exp $ +# $OpenBSD: install.sh,v 1.3 2002/06/09 06:15:15 todd Exp $ umask 0 [ "$TARDIR" ] || { echo "$0: set TARDIR first" ; exit 1; } diff --git a/etc/etc.sun3/ttys b/etc/etc.sun3/ttys index da3ea0ad534..d9485784854 100644 --- a/etc/etc.sun3/ttys +++ b/etc/etc.sun3/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.3 1997/10/11 21:22:20 deraadt Exp $ +# $OpenBSD: ttys,v 1.4 2002/06/09 06:15:15 todd Exp $ # # name getty type status comments # diff --git a/etc/etc.svr4/SVR4_MAKEDEV b/etc/etc.svr4/SVR4_MAKEDEV index 89e96e802da..7feebc5a507 100644 --- a/etc/etc.svr4/SVR4_MAKEDEV +++ b/etc/etc.svr4/SVR4_MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: SVR4_MAKEDEV,v 1.4 1997/04/11 09:06:56 niklas Exp $ +# $OpenBSD: SVR4_MAKEDEV,v 1.5 2002/06/09 06:15:15 todd Exp $ # $NetBSD: SVR4_MAKEDEV,v 1.3 1996/04/11 12:59:45 christos Exp $ # # Copyright (c) 1995 Christos Zoulas diff --git a/etc/etc.svr4/netconfig b/etc/etc.svr4/netconfig index a2b930b4269..7b62e5b5aed 100644 --- a/etc/etc.svr4/netconfig +++ b/etc/etc.svr4/netconfig @@ -1,4 +1,4 @@ -# $OpenBSD: netconfig,v 1.3 1997/04/11 09:07:00 niklas Exp $ +# $OpenBSD: netconfig,v 1.4 2002/06/09 06:15:15 todd Exp $ # $NetBSD: netconfig,v 1.2 1996/04/11 12:59:47 christos Exp $ # SVR4 Network configuration file # diff --git a/etc/etc.svr4/nsswitch.conf b/etc/etc.svr4/nsswitch.conf index 131b71c4856..ce8ab7a5f99 100644 --- a/etc/etc.svr4/nsswitch.conf +++ b/etc/etc.svr4/nsswitch.conf @@ -1,4 +1,4 @@ -# $OpenBSD: nsswitch.conf,v 1.2 1997/04/11 09:07:03 niklas Exp $ +# $OpenBSD: nsswitch.conf,v 1.3 2002/06/09 06:15:15 todd Exp $ # $NetBSD: nsswitch.conf,v 1.1 1995/07/02 06:29:51 christos Exp $ # Name service switch file # diff --git a/etc/etc.vax/disktab b/etc/etc.vax/disktab index 680c23bcac6..b183adf0c4f 100644 --- a/etc/etc.vax/disktab +++ b/etc/etc.vax/disktab @@ -1,9 +1,9 @@ -# $OpenBSD: disktab,v 1.6 2002/04/05 03:10:04 deraadt Exp $ +# $OpenBSD: disktab,v 1.7 2002/06/09 06:15:15 todd Exp $ # $NetBSD: disktab,v 1.2 1996/03/05 12:01:53 ragge Exp $ # # @(#)disktab 8.1 (Berkeley) 6/9/93 # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # dt controller type # ty type of disk (fixed, removeable, simulated) diff --git a/etc/etc.vax/ttys b/etc/etc.vax/ttys index 02c8d2fe167..b266d95afc9 100644 --- a/etc/etc.vax/ttys +++ b/etc/etc.vax/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.4 1998/06/28 03:27:10 todd Exp $ +# $OpenBSD: ttys,v 1.5 2002/06/09 06:15:15 todd Exp $ # # name getty type status comments # diff --git a/etc/kerberosIV/README b/etc/kerberosIV/README index 053c75fb06d..f1c8afb0ffe 100644 --- a/etc/kerberosIV/README +++ b/etc/kerberosIV/README @@ -1,5 +1,5 @@ # from @(#)README 8.1 (Berkeley) 6/9/93 -# $OpenBSD: README,v 1.5 2001/05/14 14:40:37 hin Exp $ +# $OpenBSD: README,v 1.6 2002/06/09 06:15:15 todd Exp $ Notes about the contents of the /etc/kerberosIV directory: diff --git a/etc/kerberosIV/krb.equiv b/etc/kerberosIV/krb.equiv index aa4ce5c7e35..f710770902b 100644 --- a/etc/kerberosIV/krb.equiv +++ b/etc/kerberosIV/krb.equiv @@ -1,4 +1,4 @@ -# $OpenBSD: krb.equiv,v 1.3 2001/05/14 14:38:20 hin Exp $ +# $OpenBSD: krb.equiv,v 1.4 2002/06/09 06:15:15 todd Exp $ # krb.equiv contains a list of IP addresses that is to be considered being # the same host for KerberosIV purposes. # Please refer to krb.equiv(5) for more information. diff --git a/etc/kerberosIV/krb.extra b/etc/kerberosIV/krb.extra index 29fc416e3f9..51485252b8a 100644 --- a/etc/kerberosIV/krb.extra +++ b/etc/kerberosIV/krb.extra @@ -1,4 +1,4 @@ -# $OpenBSD: krb.extra,v 1.1 2001/05/14 14:38:20 hin Exp $ +# $OpenBSD: krb.extra,v 1.2 2002/06/09 06:15:15 todd Exp $ # # This file holds some configuration options that are not normally used. # Please see krb.extra(5) for more information about this file - only diff --git a/etc/kerberosV/README b/etc/kerberosV/README index 4b91c25a5cf..c449e47f7e1 100644 --- a/etc/kerberosV/README +++ b/etc/kerberosV/README @@ -1,4 +1,4 @@ -# $OpenBSD: README,v 1.1 2001/06/25 03:30:22 hin Exp $ +# $OpenBSD: README,v 1.2 2002/06/09 06:15:15 todd Exp $ Notes about the KerberosV support in OpenBSD: diff --git a/etc/kerberosV/krb5.conf.example b/etc/kerberosV/krb5.conf.example index fb29d4f4258..c496e8b546c 100644 --- a/etc/kerberosV/krb5.conf.example +++ b/etc/kerberosV/krb5.conf.example @@ -1,4 +1,4 @@ -# $OpenBSD: krb5.conf.example,v 1.2 2002/02/21 21:13:11 hin Exp $ +# $OpenBSD: krb5.conf.example,v 1.3 2002/06/09 06:15:15 todd Exp $ # # Example Kerberos 5 configuration file. You need to change the defaults # in this file to match your environment. diff --git a/etc/mtree/4.4BSD.root b/etc/mtree/4.4BSD.root index 4ab9e9d8593..67293717dd1 100644 --- a/etc/mtree/4.4BSD.root +++ b/etc/mtree/4.4BSD.root @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.root,v 1.8 2002/02/09 17:37:34 deraadt Exp $ +# $OpenBSD: 4.4BSD.root,v 1.9 2002/06/09 06:15:15 todd Exp $ # $NetBSD: 4.4BSD.root,v 1.2 1996/05/12 23:30:32 thorpej Exp $ # # user: bostic diff --git a/etc/mtree/4.4BSD.var b/etc/mtree/4.4BSD.var index 1ea8ab91f5d..db79dc2e272 100644 --- a/etc/mtree/4.4BSD.var +++ b/etc/mtree/4.4BSD.var @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.var,v 1.9 1998/07/20 20:00:34 deraadt Exp $ +# $OpenBSD: 4.4BSD.var,v 1.10 2002/06/09 06:15:15 todd Exp $ # $NetBSD: 4.4BSD.var,v 1.3 1996/05/12 23:30:47 thorpej Exp $ # # user: bostic diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist index 691c1ea20f4..ddc5a0e50fb 100644 --- a/etc/mtree/BSD.local.dist +++ b/etc/mtree/BSD.local.dist @@ -1,4 +1,4 @@ -# $OpenBSD: BSD.local.dist,v 1.11 2002/05/30 06:46:13 deraadt Exp $ +# $OpenBSD: BSD.local.dist,v 1.12 2002/06/09 06:15:15 todd Exp $ # $FreeBSD: BSD.local.dist,v 1.32 1997/09/12 05:44:11 asami Exp $ # @@ -15,54 +15,54 @@ libexec .. man - cat1 + cat1 .. - cat2 + cat2 .. - cat3 + cat3 .. cat3p .. - cat4 + cat4 .. - cat5 + cat5 .. - cat6 + cat6 .. - cat7 + cat7 .. - cat8 + cat8 .. - cat9 + cat9 .. - catl + catl .. - catn + catn .. ja_JP.EUC - cat1 + cat1 .. - cat2 + cat2 .. - cat3 + cat3 .. cat3p .. - cat4 + cat4 .. - cat5 + cat5 .. - cat6 + cat6 .. - cat7 + cat7 .. - cat8 + cat8 .. - cat9 + cat9 .. - catl + catl .. - catn + catn .. man1 .. diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist index 25669de0e0a..c1cf50a3b4b 100644 --- a/etc/mtree/BSD.x11.dist +++ b/etc/mtree/BSD.x11.dist @@ -1,4 +1,4 @@ -# $OpenBSD: BSD.x11.dist,v 1.3 1998/06/10 17:21:26 marc Exp $ +# $OpenBSD: BSD.x11.dist,v 1.4 2002/06/09 06:15:15 todd Exp $ # $FreeBSD: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp $ # @@ -183,50 +183,50 @@ libexec .. man - cat1 + cat1 .. - cat2 + cat2 .. - cat3 + cat3 .. - cat4 + cat4 .. - cat5 + cat5 .. - cat6 + cat6 .. - cat7 + cat7 .. - cat8 + cat8 .. - cat9 + cat9 .. - catl + catl .. - catn + catn .. ja_JP.EUC - cat1 + cat1 .. - cat2 + cat2 .. - cat3 + cat3 .. - cat4 + cat4 .. - cat5 + cat5 .. - cat6 + cat6 .. - cat7 + cat7 .. - cat8 + cat8 .. - cat9 + cat9 .. - catl + catl .. - catn + catn .. man1 .. diff --git a/etc/namedb/root.cache b/etc/namedb/root.cache index a20028e3d84..ad9c9bda1e3 100644 --- a/etc/namedb/root.cache +++ b/etc/namedb/root.cache @@ -69,7 +69,7 @@ J.ROOT-SERVERS.NET. 3600000 A 198.41.0.10 ; housed in LINX, operated by RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. -K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 +K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 ; ; temporarily housed at ISI (IANA) ; diff --git a/etc/photuris/attributes.conf b/etc/photuris/attributes.conf index 2bf5a1c8082..a338465c007 100644 --- a/etc/photuris/attributes.conf +++ b/etc/photuris/attributes.conf @@ -1,4 +1,4 @@ -# $OpenBSD: attributes.conf,v 1.5 2001/01/28 23:31:29 niklas Exp $ +# $OpenBSD: attributes.conf,v 1.6 2002/06/09 06:15:15 todd Exp $ # Predefined keywords are AT_AH_ATTRIB, AT_ESP_ATTRIB # This is the default list, for VPN you can comment out @@ -6,7 +6,7 @@ AT_SHA1_IPMAC, 6, ident|auth, 20 AT_MD5_IPMAC, 5, ident|auth, 16 AT_ESP_ATTRIB - AT_HMAC_FLAG, 254, , + AT_HMAC_FLAG, 254, , AT_BLF_NEW, 16, enc, 56 AT_3DES_NEW, 18, enc, 24 AT_CAST_NEW, 17, enc, 16 diff --git a/etc/photuris/photuris.conf b/etc/photuris/photuris.conf index 8a34bf74f9f..d8813d9680d 100644 --- a/etc/photuris/photuris.conf +++ b/etc/photuris/photuris.conf @@ -1,4 +1,4 @@ -# $OpenBSD: photuris.conf,v 1.2 2001/01/28 23:31:29 niklas Exp $ +# $OpenBSD: photuris.conf,v 1.3 2002/06/09 06:15:15 todd Exp $ # Allowed keywords are: modulus and exchange # modulus <generator> <modulus> @@ -14,7 +14,7 @@ exchange DH_G_2_3DES_SHA1 0 exchange DH_G_2_DES_MD5 0 exchange DH_G_2_MD5 1024 exchange DH_G_2_MD5 512 -# +# config exchange_max_retransmits 3 config exchange_retransmit_timeout 7 config exchange_timeout 60 diff --git a/etc/photuris/photuris.startup b/etc/photuris/photuris.startup index 151d61d69bb..46d86365ebd 100644 --- a/etc/photuris/photuris.startup +++ b/etc/photuris/photuris.startup @@ -1,4 +1,4 @@ -# $OpenBSD: photuris.startup,v 1.3 2001/01/28 23:31:29 niklas Exp $ +# $OpenBSD: photuris.startup,v 1.4 2002/06/09 06:15:15 todd Exp $ # Initial exchanges which might be needed by NIS or NFS servers # accepted keywords are diff --git a/etc/photuris/secrets.conf b/etc/photuris/secrets.conf index aa27fb3c659..770e4b39572 100644 --- a/etc/photuris/secrets.conf +++ b/etc/photuris/secrets.conf @@ -1,10 +1,10 @@ -# $OpenBSD: secrets.conf,v 1.2 2001/01/28 23:31:30 niklas Exp $ +# $OpenBSD: secrets.conf,v 1.3 2002/06/09 06:15:15 todd Exp $ # Accepted keywords are: # identity local "id" "secret" # identity pair local "receivedid" "myid" "secret" # identity remote "id" "secret" # identity lookup "tag" username -# Simple +# Simple identity local "Default" "This should be changed." identity remote "Default" "This should be changed." diff --git a/etc/ppp/chap-secrets b/etc/ppp/chap-secrets index fa8fc887ce4..71b79d92ba2 100644 --- a/etc/ppp/chap-secrets +++ b/etc/ppp/chap-secrets @@ -1,4 +1,4 @@ -# $OpenBSD: chap-secrets,v 1.2 2001/01/28 23:31:30 niklas Exp $ +# $OpenBSD: chap-secrets,v 1.3 2002/06/09 06:15:15 todd Exp $ # Secrets for authentication using CHAP # client server secret IP addresses diff --git a/etc/ppp/pap-secrets b/etc/ppp/pap-secrets index 35056f3034f..c1214f2aca2 100644 --- a/etc/ppp/pap-secrets +++ b/etc/ppp/pap-secrets @@ -1,4 +1,4 @@ -# $OpenBSD: pap-secrets,v 1.2 2001/01/28 23:31:30 niklas Exp $ +# $OpenBSD: pap-secrets,v 1.3 2002/06/09 06:15:15 todd Exp $ # Secrets for authentication using PAP # client server secret IP addresses diff --git a/etc/ppp/ppp.conf.sample b/etc/ppp/ppp.conf.sample index 5027e500beb..1b0b4211876 100644 --- a/etc/ppp/ppp.conf.sample +++ b/etc/ppp/ppp.conf.sample @@ -4,7 +4,7 @@ # # Originally written by Toshiharu OHNO # -# $OpenBSD: ppp.conf.sample,v 1.20 2001/09/12 19:35:31 brian Exp $ +# $OpenBSD: ppp.conf.sample,v 1.21 2002/06/09 06:15:15 todd Exp $ # ################################################################# @@ -280,16 +280,16 @@ dodgynet: # If the remote host allowed IP forwarding and we wanted to use it, the # following rules could be split into two groups to separately validate # the source and destination addresses. - set filter dial 7 permit 172.17.16.0/20 172.17.20.248 - set filter dial 8 permit 172.17.36.0/22 172.17.20.248 - set filter dial 9 permit 172.17.118.0/26 172.17.20.248 - set filter dial 10 permit 10.123.5.0/24 172.17.20.248 + set filter dial 7 permit 172.17.16.0/20 172.17.20.248 + set filter dial 8 permit 172.17.36.0/22 172.17.20.248 + set filter dial 9 permit 172.17.118.0/26 172.17.20.248 + set filter dial 10 permit 10.123.5.0/24 172.17.20.248 # Once the link's up, limit outgoing access to the specified hosts - set filter out 0 4 172.17.16.0/20 172.17.20.248 - set filter out 1 4 172.17.36.0/22 172.17.20.248 - set filter out 2 4 172.17.118.0/26 172.17.20.248 - set filter out 3 deny ! 10.123.5.0/24 172.17.20.248 + set filter out 0 4 172.17.16.0/20 172.17.20.248 + set filter out 1 4 172.17.36.0/22 172.17.20.248 + set filter out 2 4 172.17.118.0/26 172.17.20.248 + set filter out 3 deny ! 10.123.5.0/24 172.17.20.248 # Allow established TCP connections set filter out 4 permit 0 0 tcp estab # And new connections to http, rlogin, rsh, telnet, ftp and ports @@ -379,7 +379,7 @@ direct-client: set ifaddr 10.0.4.2 10.0.4.1 enable lqr accept lqr - + direct-server: set timeout 0 set lqrperiod 10 @@ -390,7 +390,7 @@ direct-server: # Example to connect via compuserve (who insist on 7 bits even parity -# during the chat phase). +# during the chat phase). # compuserve: set phone 1234567 @@ -436,7 +436,7 @@ loop: set login set ifaddr 127.0.0.2 127.0.0.3 set server /var/tmp/loop "" 0177 - + loop-in: set timeout 0 set log phase lcp ipcp command @@ -510,8 +510,8 @@ mloop: clone 1 2 3 link deflink remove # dial - # link 2 dial - # link 3 dial + # link 2 dial + # link 3 dial mloop-in: set timeout 0 diff --git a/etc/ppp/ppp.linkdown.sample b/etc/ppp/ppp.linkdown.sample index cb719572590..47cfa141640 100644 --- a/etc/ppp/ppp.linkdown.sample +++ b/etc/ppp/ppp.linkdown.sample @@ -12,7 +12,7 @@ # 3) If no label has been found, use MYADDR if it exists. # # -# $OpenBSD: ppp.linkdown.sample,v 1.4 1998/11/05 23:13:43 brian Exp $ +# $OpenBSD: ppp.linkdown.sample,v 1.5 2002/06/09 06:15:15 todd Exp $ # ######################################################################### diff --git a/etc/ppp/ppp.linkup.sample b/etc/ppp/ppp.linkup.sample index 4dee12efd1e..d654cee3311 100644 --- a/etc/ppp/ppp.linkup.sample +++ b/etc/ppp/ppp.linkup.sample @@ -12,7 +12,7 @@ # 3) If no label has been found, use MYADDR if it exists. # # -# $OpenBSD: ppp.linkup.sample,v 1.3 1998/09/23 07:30:58 todd Exp $ +# $OpenBSD: ppp.linkup.sample,v 1.4 2002/06/09 06:15:15 todd Exp $ # ######################################################################### @@ -44,6 +44,6 @@ pmdemand: # If your minimum call charge is 5 minutes, you may as well stay on # the line for that amount of time. If we want a 60 second subsequent # timeout, set your timeout to 300 in ppp.conf and then do this: -# +# min5minutes: !bg sh -c "sleep 240; pppctl -p mypassword 3000 set timeout 60" diff --git a/etc/ppp/ppp.secret.sample b/etc/ppp/ppp.secret.sample index 73f7e35ad9e..4bf5034380b 100644 --- a/etc/ppp/ppp.secret.sample +++ b/etc/ppp/ppp.secret.sample @@ -26,8 +26,8 @@ # field, these numbers will be used to call back the client if # ``auth'' or ``cbcp'' callback is enabled (see ``set callback''). # A ``*'' specifies that the client must specify the number. -# -# $OpenBSD: ppp.secret.sample,v 1.3 1998/09/23 07:30:58 todd Exp $ +# +# $OpenBSD: ppp.secret.sample,v 1.4 2002/06/09 06:15:15 todd Exp $ # ################################################## diff --git a/etc/root/dot.klogin b/etc/root/dot.klogin index 3c3cb9228cd..9b6415549cf 100644 --- a/etc/root/dot.klogin +++ b/etc/root/dot.klogin @@ -1,4 +1,4 @@ -# $OpenBSD: dot.klogin,v 1.3 2001/01/28 23:31:30 niklas Exp $ +# $OpenBSD: dot.klogin,v 1.4 2002/06/09 06:15:15 todd Exp $ #user1.root@your.realm.wherever #user2.root@your.realm.wherever diff --git a/etc/root/dot.login b/etc/root/dot.login index 70c76277093..4fe1d716601 100644 --- a/etc/root/dot.login +++ b/etc/root/dot.login @@ -1,4 +1,4 @@ -set tterm='?'$TERM +set tterm='?'$TERM set noglob onintr finish eval `tset -s -Q $tterm` diff --git a/etc/skel/dot.cshrc b/etc/skel/dot.cshrc index 0fe523fb1d8..a3a84606299 100644 --- a/etc/skel/dot.cshrc +++ b/etc/skel/dot.cshrc @@ -1,4 +1,4 @@ -# $OpenBSD: dot.cshrc,v 1.2 2000/05/01 20:37:54 jakob Exp $ +# $OpenBSD: dot.cshrc,v 1.3 2002/06/09 06:15:15 todd Exp $ # # csh initialization diff --git a/etc/skel/dot.login b/etc/skel/dot.login index 3f9be80ac86..d369fd3e1dc 100644 --- a/etc/skel/dot.login +++ b/etc/skel/dot.login @@ -1,4 +1,4 @@ -# $OpenBSD: dot.login,v 1.2 2000/05/01 20:38:41 jakob Exp $ +# $OpenBSD: dot.login,v 1.3 2002/06/09 06:15:15 todd Exp $ # # csh login file diff --git a/etc/skel/dot.profile b/etc/skel/dot.profile index 50730efba47..3c463353db9 100644 --- a/etc/skel/dot.profile +++ b/etc/skel/dot.profile @@ -1,5 +1,5 @@ -# $OpenBSD: dot.profile,v 1.2 2000/05/01 20:37:55 jakob Exp $ -# +# $OpenBSD: dot.profile,v 1.3 2002/06/09 06:15:15 todd Exp $ +# # sh/ksh initialization PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/games:. diff --git a/etc/skel/dot.rhosts b/etc/skel/dot.rhosts index 55e27fb2d54..72780c07ca9 100644 --- a/etc/skel/dot.rhosts +++ b/etc/skel/dot.rhosts @@ -1,4 +1,4 @@ -# $OpenBSD: dot.rhosts,v 1.2 2001/01/28 23:31:30 niklas Exp $ +# $OpenBSD: dot.rhosts,v 1.3 2002/06/09 06:15:15 todd Exp $ # Format of this file is <hostname> <username> #localhost foobar |