lukem e111111128 resolve conflicts from lite-2 merge.

1997-09-16 16:44:43 +00:00

..

badsect

resolve sccsid conflict

1997-09-16 02:13:23 +00:00

bim

…

ccdconfig

define WARNS?=1 for all of sbin/*

1997-09-15 12:45:47 +00:00

clri

resolve sccsid conflict

1997-09-16 02:33:48 +00:00

disklabel

fix sccsid conflict

1997-09-16 02:43:59 +00:00

dmesg

…

dump

make these compile on the alpha after WARNS=1.

1997-09-16 08:37:01 +00:00

edlabel

…

fastboot

fixup .Nm usage

1997-09-15 12:41:52 +00:00

fdisk

define WARNS?=1 for all of sbin/*

1997-09-15 12:45:47 +00:00

fsck

resolve conflicts from lite-2 merge

1997-09-16 14:52:35 +00:00

fsck_ext2fs

make these compile on the alpha after WARNS=1.

1997-09-16 08:37:01 +00:00

fsck_ffs

resolve conflicts from lite-2 merge.

1997-09-16 16:44:43 +00:00

fsck_msdos

…

fsdb

make these compile on the alpha after WARNS=1.

1997-09-16 08:37:01 +00:00

fsirand

…

ifconfig

…

init

define WARNS?=1 for all of sbin/*

1997-09-15 12:45:47 +00:00

ldconfig

…

mknod

…

modload

make these compile on the alpha after WARNS=1.

1997-09-16 08:37:01 +00:00

modunload

…

mount

resolve conflicts from lite-2 import, with two major modifications

1997-09-16 12:22:39 +00:00

mount_ados

update for new getmntopts() brought in from lite-2 merge

1997-09-16 12:23:34 +00:00

mount_cd9660

resolve conflicts from lite-2 merge

1997-09-16 12:25:36 +00:00

mount_ext2fs

apply mods from lite-2 vers. of mount/mount_ufs.c (which this is derived from)

1997-09-16 12:26:29 +00:00

mount_fdesc

resolve conflicts from lite-2 merge

1997-09-16 12:26:56 +00:00

mount_ffs

apply mods from lite-2 vers. of mount/mount_ufs.c (which this is derived from)

1997-09-16 12:26:29 +00:00

mount_kernfs

resolve conflicts from lite-2 merge

1997-09-16 12:26:56 +00:00

mount_lfs

resolve conflicts from lite-2 merge

1997-09-16 12:26:56 +00:00

mount_msdos

update for new getmntopts() brought in from lite-2 merge

1997-09-16 12:24:18 +00:00

mount_nfs

back to using mount/getmntopts.c since mount is now post lite-2

1997-09-16 12:31:11 +00:00

mount_null

resolve conflicts from lite-2 merge

1997-09-16 12:26:56 +00:00

mount_portal

resolve conflicts from lite-2 merge

1997-09-16 12:32:03 +00:00

mount_procfs

resolve conflicts from lite-2 merge

1997-09-16 12:32:03 +00:00

mount_umap

resolve conflicts from lite-2 merge

1997-09-16 12:32:03 +00:00

mount_union

resolve conflicts from lite-2 merge

1997-09-16 12:32:03 +00:00

newfs

* resolve conflicts from lite-2 import

1997-09-16 14:05:39 +00:00

newfs_msdos

…

newlfs

deprecate register

1997-09-15 11:40:28 +00:00

nologin

…

ping

…

reboot

define WARNS?=1 for all of sbin/*

1997-09-15 12:45:47 +00:00

restore

resolve conflicts from lite-2 merge

1997-09-16 13:44:12 +00:00

route

resolve conflicts from lite-2 import

1997-09-16 07:04:17 +00:00

routed

make these compile on the alpha after WARNS=1.

1997-09-16 08:37:01 +00:00

savecore

resolve conflicts from lite-2 merge

1997-09-16 14:19:03 +00:00

shutdown

resolve conflicts from lite-2 merge

1997-09-16 12:54:42 +00:00

slattach

…

swapctl

…

ttyflags

…

tunefs

resolve conflicts from lite-2 merge

1997-09-16 12:54:42 +00:00

umount

resolve conflicts from lite-2 merge

1997-09-16 12:24:05 +00:00

Makefile

…

Makefile.inc

define WARNS?=1 for all of sbin/*

1997-09-15 12:45:47 +00:00