summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormickey <mickey@openbsd.org>2000-06-09 17:42:49 +0000
committermickey <mickey@openbsd.org>2000-06-09 17:42:49 +0000
commit6310220a284a8d91f8de05c7ce0026a25f4e3243 (patch)
tree82c50ca67533d8b1bfd6371ca1f3ac50ae374a2e
parentAdd common routines for read/writing Cypress 82c693 control registers from (diff)
downloadwireguard-openbsd-6310220a284a8d91f8de05c7ce0026a25f4e3243.tar.xz
wireguard-openbsd-6310220a284a8d91f8de05c7ce0026a25f4e3243.zip
chown/chgrp changes
-rw-r--r--distrib/alpha/inst-common/list6
-rw-r--r--distrib/alpha/ramdisk/raminst.conf7
-rw-r--r--distrib/alpha/simpleroot/list2
-rw-r--r--distrib/arc/common/instbin-krb.conf7
-rw-r--r--distrib/arc/common/instbin.conf7
-rw-r--r--distrib/arc/common/list6
-rw-r--r--distrib/arc/floppies/inst-common/instbin.conf7
-rw-r--r--distrib/arc/floppies/inst-common/list6
-rw-r--r--distrib/arc/ramdisk/list6
-rw-r--r--distrib/arm32/floppies/inst-common/instbin.conf7
-rw-r--r--distrib/arm32/floppies/inst-common/list6
-rw-r--r--distrib/atari/inst-common/instbin.conf7
-rw-r--r--distrib/atari/inst-common/list6
-rw-r--r--distrib/crunch/README2
-rw-r--r--distrib/hp300/ramdisk/list6
-rw-r--r--distrib/hp300/ramdisk/raminst.conf7
-rw-r--r--distrib/i386/floppies/common/instbin-nokrb.conf7
-rw-r--r--distrib/i386/floppies/common/instbin.conf7
-rw-r--r--distrib/i386/floppies/common/list5
-rw-r--r--distrib/mac68k/ramdisk/list6
-rw-r--r--distrib/mac68k/ramdisk/raminst.conf7
-rw-r--r--distrib/miniroot/list5
-rw-r--r--distrib/mvme68k/ramdisk/list5
-rw-r--r--distrib/mvme88k/ramdisk/list6
-rw-r--r--distrib/mvme88k/ramdisk/raminst.conf7
-rw-r--r--distrib/pc532/floppies/inst-common/instbin.conf7
-rw-r--r--distrib/pc532/floppies/inst-common/list6
-rw-r--r--distrib/pmax/ramdisk/list6
-rw-r--r--distrib/pmax/ramdisk/raminst.conf7
-rw-r--r--distrib/pmax/simpleroot/list2
-rw-r--r--distrib/powerpc/ramdisk/list5
-rw-r--r--distrib/ramdisk/list5
-rw-r--r--distrib/sun3/common/mini_bin.list3
-rw-r--r--distrib/sun3/common/mini_sbin.list3
-rw-r--r--distrib/sun3/common/mini_usr.conf6
-rw-r--r--distrib/sun3/common/mini_usr.list4
-rw-r--r--distrib/sun3/ramdisk/list6
-rw-r--r--distrib/sun3/ramdisk/raminst.conf7
-rw-r--r--distrib/vax/inst-common/instbin.conf7
-rw-r--r--distrib/vax/inst-common/list6
40 files changed, 122 insertions, 108 deletions
diff --git a/distrib/alpha/inst-common/list b/distrib/alpha/inst-common/list
index a42901d9f10..eba835bfeca 100644
--- a/distrib/alpha/inst-common/list
+++ b/distrib/alpha/inst-common/list
@@ -1,11 +1,12 @@
#
-# $OpenBSD: list,v 1.12 1999/04/04 22:25:37 millert Exp $
+# $OpenBSD: list,v 1.13 2000/06/09 17:42:49 mickey Exp $
#
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
LINK raminst bin/chmod
+LINK raminst bin/chgrp
LINK raminst bin/cp
LINK raminst bin/cpio
LINK raminst bin/dd
@@ -22,6 +23,7 @@ LINK raminst bin/rm
LINK raminst bin/stty
LINK raminst bin/sleep
LINK raminst bin/tar
+LINK raminst sbin/chown
LINK raminst sbin/disklabel
LINK raminst sbin/fsck
LINK raminst sbin/halt
@@ -38,7 +40,6 @@ LINK raminst sbin/newfs
LINK raminst sbin/reboot
LINK raminst sbin/route
LINK raminst sbin/umount
-LINK raminst usr/bin/chgrp
LINK raminst usr/bin/ftp
LINK raminst usr/bin/egrep
LINK raminst usr/bin/fgrep
@@ -48,7 +49,6 @@ LINK raminst usr/bin/less
LINK raminst usr/bin/more
LINK raminst usr/bin/sed
LINK raminst usr/bin/pax
-LINK raminst usr/sbin/chown
LINK raminst usr/mdec/installboot
SPECIAL /bin/rm raminst
diff --git a/distrib/alpha/ramdisk/raminst.conf b/distrib/alpha/ramdisk/raminst.conf
index 8550ee1de5f..947ec51d28b 100644
--- a/distrib/alpha/ramdisk/raminst.conf
+++ b/distrib/alpha/ramdisk/raminst.conf
@@ -1,5 +1,5 @@
#
-# $OpenBSD: raminst.conf,v 1.17 1999/04/04 23:47:25 millert Exp $
+# $OpenBSD: raminst.conf,v 1.18 2000/06/09 17:42:49 mickey Exp $
#
# ram.conf - unified binary for the RAM disk
#
@@ -7,13 +7,14 @@
srcdirs distrib/special bin sbin usr.bin usr.sbin
srcdirs gnu/usr.bin sys/arch/alpha/stand
-progs cat chmod chown cp dd df disklabel ed grep fsck_ffs ftp
+progs cat chmod cp dd df disklabel ed grep fsck_ffs ftp
progs gzip ifconfig init installboot less ln ls mkdir mknod mount
progs mount_cd9660 mount_kernfs mount_ffs mv newfs ksh
progs reboot rm route rsh sed sleep stty pax umount dhclient expr
#progs mount_nfs slattach sync tip
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln ksh sh
ln ksh -sh # init invokes the shell this way
diff --git a/distrib/alpha/simpleroot/list b/distrib/alpha/simpleroot/list
index e92512c7d16..d0d28d207b0 100644
--- a/distrib/alpha/simpleroot/list
+++ b/distrib/alpha/simpleroot/list
@@ -26,8 +26,6 @@ usr/bin/strings
usr/bin/tftp
usr/bin/vi
usr/mdec
-usr/sbin/chgrp
-usr/sbin/chown
usr/sbin/chroot
usr/sbin/rdate
usr/share/misc/termcap
diff --git a/distrib/arc/common/instbin-krb.conf b/distrib/arc/common/instbin-krb.conf
index 1fccba155e1..b4f14b34cbb 100644
--- a/distrib/arc/common/instbin-krb.conf
+++ b/distrib/arc/common/instbin-krb.conf
@@ -1,11 +1,11 @@
-# $OpenBSD: instbin-krb.conf,v 1.2 1997/12/02 02:29:29 deraadt Exp $
+# $OpenBSD: instbin-krb.conf,v 1.3 2000/06/09 17:42:50 mickey Exp $
#
# instbin.conf - unified binary for the inst/upgr floppies
#
srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd
-progs awk bad144 cat chmod chown cp dd df disklabel ed expr fsck_ffs
+progs awk bad144 cat chmod cp dd df disklabel ed expr fsck_ffs
progs ftp fdisk
progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
progs mount_ffs mount_msdos mount_nfs mount_kernfs
@@ -13,7 +13,8 @@ progs mv newfs pax ksh ping pppd pwd reboot rm route
progs scsi sed shutdown slattach stty sync test tip umount
progs rsh restore gzip
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln less more
ln pax tar
diff --git a/distrib/arc/common/instbin.conf b/distrib/arc/common/instbin.conf
index fc91babd016..3bff904f6d0 100644
--- a/distrib/arc/common/instbin.conf
+++ b/distrib/arc/common/instbin.conf
@@ -1,11 +1,11 @@
-# $OpenBSD: instbin.conf,v 1.2 1997/12/02 02:29:31 deraadt Exp $
+# $OpenBSD: instbin.conf,v 1.3 2000/06/09 17:42:50 mickey Exp $
#
# instbin.conf - unified binary for the inst/upgr floppies
#
srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd
-progs awk bad144 cat chat chmod chown cp dd df disklabel ed
+progs awk bad144 cat chat chmod cp dd df disklabel ed
progs expr fsck_ffs ftp fdisk
progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
progs mount_ffs mount_msdos mount_nfs mount_kernfs
@@ -13,7 +13,8 @@ progs mv newfs pax ksh ping pppd pwd reboot rm route
progs scsi sed shutdown slattach stty sync test tip umount
progs rsh restore gzip
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln less more
ln pax tar
diff --git a/distrib/arc/common/list b/distrib/arc/common/list
index 2b32f36a688..311307826e0 100644
--- a/distrib/arc/common/list
+++ b/distrib/arc/common/list
@@ -1,9 +1,10 @@
-# $OpenBSD: list,v 1.1 1997/05/14 21:13:32 pefo Exp $
+# $OpenBSD: list,v 1.2 2000/06/09 17:42:50 mickey Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/cpio
LINK instbin bin/dd
@@ -24,6 +25,7 @@ LINK instbin bin/sync
LINK instbin bin/tar
LINK instbin bin/test
LINK instbin bin/[
+LINK instbin sbin/chown
LINK instbin sbin/disklabel
LINK instbin sbin/fdisk
LINK instbin sbin/fsck
@@ -49,7 +51,6 @@ LINK instbin sbin/slattach
LINK instbin sbin/umount
SYMLINK /bin/cat usr/bin/awk
SYMLINK /bin/cat usr/bin/cut
-SYMLINK /bin/cat usr/bin/chgrp
SYMLINK /bin/cat usr/bin/egrep
SYMLINK /bin/cat usr/bin/fgrep
SYMLINK /bin/cat usr/bin/ftp
@@ -65,7 +66,6 @@ SYMLINK /bin/cat usr/bin/tip
SYMLINK /bin/cat usr/bin/vi
SYMLINK /bin/cat usr/sbin/bad144
SYMLINK /bin/cat usr/sbin/chat
-SYMLINK /bin/cat usr/sbin/chown
SYMLINK /bin/cat usr/sbin/pppd
SPECIAL /bin/rm instbin
diff --git a/distrib/arc/floppies/inst-common/instbin.conf b/distrib/arc/floppies/inst-common/instbin.conf
index 3ebb02af728..91f709faf80 100644
--- a/distrib/arc/floppies/inst-common/instbin.conf
+++ b/distrib/arc/floppies/inst-common/instbin.conf
@@ -1,17 +1,18 @@
-# $OpenBSD: instbin.conf,v 1.2 2000/03/01 22:09:57 todd Exp $
+# $OpenBSD: instbin.conf,v 1.3 2000/06/09 17:42:50 mickey Exp $
#
# kcbin.conf - unified binary for the kc floppy
#
srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin
-progs bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck_ffs
+progs bad144 cat chmod chroot cp dd df disklabel ed expr fsck_ffs
progs ftp awk gzip
progs ifconfig init ln ls mkdir mknod less mount mount_cd9660
progs mount_ffs mount_msdos mount_nfs mv newfs pax ping pwd reboot rm route
progs sed sh shutdown slattach strings stty sync test tip umount
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln pax tar
ln sh -sh # init invokes the shell this way
ln test [
diff --git a/distrib/arc/floppies/inst-common/list b/distrib/arc/floppies/inst-common/list
index 94ea2be64c2..455b4071952 100644
--- a/distrib/arc/floppies/inst-common/list
+++ b/distrib/arc/floppies/inst-common/list
@@ -1,9 +1,10 @@
-# $OpenBSD: list,v 1.2 2000/03/01 22:09:57 todd Exp $
+# $OpenBSD: list,v 1.3 2000/06/09 17:42:50 mickey Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/dd
LINK instbin bin/df
@@ -21,6 +22,7 @@ LINK instbin bin/sync
LINK instbin bin/tar
LINK instbin bin/test
LINK instbin bin/[
+LINK instbin sbin/chown
LINK instbin sbin/disklabel
LINK instbin sbin/fsck
LINK instbin sbin/fsck_ffs
@@ -41,7 +43,6 @@ LINK instbin sbin/shutdown
LINK instbin sbin/slattach
LINK instbin sbin/umount
SYMLINK /bin/cat usr/bin/awk
-SYMLINK /bin/cat usr/bin/chgrp
SYMLINK /bin/cat usr/bin/ftp
SYMLINK /bin/cat usr/bin/less
SYMLINK /bin/cat usr/bin/gzip
@@ -50,7 +51,6 @@ SYMLINK /bin/cat usr/bin/sed
SYMLINK /bin/cat usr/bin/strings
SYMLINK /bin/cat usr/bin/tip
#SYMLINK /bin/cat usr/sbin/bad144
-SYMLINK /bin/cat usr/sbin/chown
SYMLINK /bin/cat usr/sbin/chroot
SPECIAL /bin/rm instbin
SPECIAL sync
diff --git a/distrib/arc/ramdisk/list b/distrib/arc/ramdisk/list
index 168f35dfd24..840f666708f 100644
--- a/distrib/arc/ramdisk/list
+++ b/distrib/arc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.9 1998/03/25 11:55:27 pefo Exp $
+# $OpenBSD: list,v 1.10 2000/06/09 17:42:50 mickey Exp $
SRCDIRS distrib/special
SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
@@ -8,6 +8,7 @@ SRCDIRS usr.bin/vi usr.sbin/pppd
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/dd
LINK instbin bin/df
@@ -27,6 +28,7 @@ LINK instbin bin/sleep
LINK instbin bin/stty
LINK instbin bin/sync
LINK instbin bin/test bin/[
+LINK instbin sbin/chown
LINK instbin sbin/disklabel
LINK instbin sbin/fdisk
LINK instbin sbin/fsck
@@ -60,9 +62,7 @@ LINK instbin usr/bin/sed
LINK instbin usr/bin/sort
LINK instbin usr/bin/tip
LINK instbin usr/sbin/chat
-LINK instbin usr/sbin/chown usr/sbin/chgrp
LINK instbin usr/sbin/pppd
-SYMLINK ../../instbin usr/sbin/chown usr/bin/chgrp
SYMLINK ../../instbin usr/bin/ftp
SYMLINK ../../instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
SYMLINK ../../instbin usr/bin/sed
diff --git a/distrib/arm32/floppies/inst-common/instbin.conf b/distrib/arm32/floppies/inst-common/instbin.conf
index 1134564fcc4..1eb0ca167f8 100644
--- a/distrib/arm32/floppies/inst-common/instbin.conf
+++ b/distrib/arm32/floppies/inst-common/instbin.conf
@@ -1,18 +1,19 @@
#
-# $OpenBSD: instbin.conf,v 1.3 2000/03/01 22:09:59 todd Exp $
+# $OpenBSD: instbin.conf,v 1.4 2000/06/09 17:42:50 mickey Exp $
# $NetBSD: instbin.conf,v 1.1 1996/05/16 19:59:07 mark Exp $
#
srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
-progs cat chmod chown chroot cp dd df disklabel ed expr fsck_ffs ftp gawk grep
+progs cat chmod chroot cp dd df disklabel ed expr fsck_ffs ftp gawk grep
progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
progs mount_ffs mount_msdos mount_nfs mount_kernfs
progs mv newfs ping printf pwd reboot rm route
progs sed sh shutdown slattach strings stty sync tar test tip umount
progs update cksum wc tee tr cut cmp xargs
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln gawk awk
ln grep egrep
diff --git a/distrib/arm32/floppies/inst-common/list b/distrib/arm32/floppies/inst-common/list
index c7cb6ae274e..ca35186f2dd 100644
--- a/distrib/arm32/floppies/inst-common/list
+++ b/distrib/arm32/floppies/inst-common/list
@@ -1,10 +1,11 @@
-# $OpenBSD: list,v 1.3 2000/03/01 22:09:59 todd Exp $
+# $OpenBSD: list,v 1.4 2000/06/09 17:42:51 mickey Exp $
# $NetBSD: list,v 1.1 1996/05/16 19:59:08 mark Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/dd
LINK instbin bin/df
@@ -21,6 +22,7 @@ LINK instbin bin/stty
LINK instbin bin/sync
LINK instbin bin/test
LINK instbin bin/[
+LINK instbin sbin/chown
LINK instbin sbin/disklabel
LINK instbin sbin/fsck
LINK instbin sbin/fsck_ffs
@@ -42,7 +44,6 @@ LINK instbin sbin/shutdown
LINK instbin sbin/slattach
LINK instbin sbin/umount
SYMLINK /bin/cat usr/bin/awk
-SYMLINK /bin/cat usr/bin/chgrp
SYMLINK /bin/cat usr/bin/cksum
SYMLINK /bin/cat usr/bin/cmp
SYMLINK /bin/cat usr/bin/cut
@@ -58,7 +59,6 @@ SYMLINK /bin/cat usr/bin/tip
SYMLINK /bin/cat usr/bin/tr
SYMLINK /bin/cat usr/bin/wc
SYMLINK /bin/cat usr/bin/xargs
-SYMLINK /bin/cat usr/sbin/chown
SYMLINK /bin/cat usr/sbin/chroot
SYMLINK /bin/cat usr/sbin/update
SPECIAL /bin/rm instbin
diff --git a/distrib/atari/inst-common/instbin.conf b/distrib/atari/inst-common/instbin.conf
index e6ebc62b991..4572d186bea 100644
--- a/distrib/atari/inst-common/instbin.conf
+++ b/distrib/atari/inst-common/instbin.conf
@@ -1,5 +1,5 @@
#
-# $OpenBSD: instbin.conf,v 1.5 2000/03/01 22:10:01 todd Exp $
+# $OpenBSD: instbin.conf,v 1.6 2000/06/09 17:42:51 mickey Exp $
# $NetBSD: instbin.conf,v 1.5 1995/08/28 20:10:30 leo Exp $
#
# kcbin.conf - unified binary for the kc floppy
@@ -8,12 +8,13 @@
srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
srcdirs /usr/src/gnu/usr.bin
-progs cat chmod chown chroot cp dd df disklabel ed expr fsck ftp
+progs cat chmod chroot cp dd df disklabel ed expr fsck ftp
progs ifconfig init ln ls mkdir mknod more mount mount_cd9660
progs mount_ffs mount_msdos mount_nfs mv newfs printf pwd reboot rm route sed
progs sh shutdown slattach strings stty sync tar test tip umount update
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln reboot halt
ln sh -sh # init invokes the shell this way
ln test [
diff --git a/distrib/atari/inst-common/list b/distrib/atari/inst-common/list
index 79de0b96968..e70863e1e21 100644
--- a/distrib/atari/inst-common/list
+++ b/distrib/atari/inst-common/list
@@ -1,5 +1,5 @@
#
-# $OpenBSD: list,v 1.5 2000/03/01 22:10:01 todd Exp $
+# $OpenBSD: list,v 1.6 2000/06/09 17:42:51 mickey Exp $
# $NetBSD: list,v 1.4 1995/08/25 19:17:45 leo Exp $
#
@@ -7,6 +7,7 @@
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/df
LINK instbin bin/dd
@@ -24,6 +25,7 @@ LINK instbin bin/stty
LINK instbin bin/sync
LINK instbin bin/test
LINK instbin bin/[
+LINK instbin sbin/chown
LINK instbin sbin/disklabel
LINK instbin sbin/fsck
LINK instbin sbin/halt
@@ -41,7 +43,6 @@ LINK instbin sbin/route
LINK instbin sbin/shutdown
LINK instbin sbin/slattach
LINK instbin sbin/umount
-LINK instbin usr/bin/chgrp
LINK instbin usr/bin/ftp
LINK instbin usr/bin/more
LINK instbin usr/bin/printf
@@ -49,7 +50,6 @@ LINK instbin usr/bin/sed
LINK instbin usr/bin/strings
LINK instbin usr/bin/tar
LINK instbin usr/bin/tip
-LINK instbin usr/sbin/chown
LINK instbin usr/sbin/chroot
LINK instbin usr/sbin/update
SPECIAL /bin/rm instbin
diff --git a/distrib/crunch/README b/distrib/crunch/README
index c5914813081..6b150b57225 100644
--- a/distrib/crunch/README
+++ b/distrib/crunch/README
@@ -33,7 +33,7 @@ As an example, I have created an 980K crunched "fixit" binary containing
the following programs in their entirety:
cat chmod cp date dd df echo ed expr hostname kill ln ls mkdir
- mt mv pwd rcp rm rmdir sh sleep stty sync test [ badsect chown
+ mt mv pwd rcp rm rmdir sh sleep stty sync test [ badsect
clri disklabel dump rdump dmesg fdisk fsck halt ifconfig init
mknod mount newfs ping reboot restore rrestore swapon umount
ftp rsh sed telnet rlogin vi cpio gzip gunzip gzcat
diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index 0f4436a0b12..735313c5414 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list
@@ -1,8 +1,9 @@
-# $OpenBSD: list,v 1.15 2000/05/07 02:15:12 millert Exp $
+# $OpenBSD: list,v 1.16 2000/06/09 17:42:51 mickey Exp $
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
LINK raminst bin/chmod
+LINK raminst bin/chgrp
LINK raminst bin/cp
LINK raminst bin/df
LINK raminst bin/dd
@@ -19,6 +20,7 @@ LINK bin/sh bin/-sh
LINK raminst bin/sleep
LINK raminst bin/stty
LINK raminst bin/sync
+LINK raminst sbin/chown
LINK raminst sbin/disklabel
LINK raminst sbin/fsck
LINK raminst sbin/halt
@@ -37,7 +39,6 @@ LINK raminst sbin/reboot
LINK raminst sbin/route
LINK raminst sbin/slattach
LINK raminst sbin/umount
-LINK raminst usr/bin/chgrp
LINK raminst usr/bin/ftp
LINK raminst usr/bin/egrep
LINK raminst usr/bin/grep
@@ -49,7 +50,6 @@ LINK raminst bin/pax
LINK raminst usr/bin/tar
LINK raminst usr/bin/tip
LINK raminst usr/sbin/chat
-LINK raminst usr/sbin/chown
LINK raminst usr/sbin/pppd
LINK raminst usr/bin/vi
LINK raminst sbin/dhclient
diff --git a/distrib/hp300/ramdisk/raminst.conf b/distrib/hp300/ramdisk/raminst.conf
index 3abeaeadfb8..733d9999f6f 100644
--- a/distrib/hp300/ramdisk/raminst.conf
+++ b/distrib/hp300/ramdisk/raminst.conf
@@ -1,5 +1,5 @@
#
-# $OpenBSD: raminst.conf,v 1.10 2000/05/07 01:43:35 millert Exp $
+# $OpenBSD: raminst.conf,v 1.11 2000/06/09 17:42:51 mickey Exp $
#
# raminst.conf - unified binary for the RAM disk
#
@@ -7,14 +7,15 @@
srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd
srcdirs usr.bin/vi distrib/special
-progs cat chat chmod chown chroot cp dd df disklabel dhclient ed expr
+progs cat chat chmod chroot cp dd df disklabel dhclient ed expr
progs fsck_ffs ftp grep gzip hostname ifconfig init less ln ls
progs mkdir mknod mount mount_cd9660 mount_ffs mount_kernfs mount_nfs
progs mv newfs pax ksh ping pppd reboot rm route build
progs sed slattach sleep sort stty sync tip umount restore
ln pax tar
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln ksh sh
ln ksh -sh # init invokes the shell this way
diff --git a/distrib/i386/floppies/common/instbin-nokrb.conf b/distrib/i386/floppies/common/instbin-nokrb.conf
index c08f708bac5..6df822b86d2 100644
--- a/distrib/i386/floppies/common/instbin-nokrb.conf
+++ b/distrib/i386/floppies/common/instbin-nokrb.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: instbin-nokrb.conf,v 1.2 1999/12/05 19:37:47 mickey Exp $
+# $OpenBSD: instbin-nokrb.conf,v 1.3 2000/06/09 17:42:53 mickey Exp $
#
# instbin-nokrb.conf - unified binary for the inst/upgr floppies
#
@@ -6,7 +6,7 @@
srcdirs distrib/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
srcdirs usr.sbin/pppd sys/arch/i386/stand
-progs cat chmod chown cp dd df disklabel dhclient ed
+progs cat chmod cp dd df disklabel dhclient ed
progs fsck_ffs ftp fdisk
progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs
@@ -14,7 +14,8 @@ progs mv newfs pax ksh ping reboot rm route
progs sed sleep stty tip umount
progs rsh restore gzip sort grep installboot
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln less more
ln pax tar
diff --git a/distrib/i386/floppies/common/instbin.conf b/distrib/i386/floppies/common/instbin.conf
index 3ef85392053..5a5d542f6b6 100644
--- a/distrib/i386/floppies/common/instbin.conf
+++ b/distrib/i386/floppies/common/instbin.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: instbin.conf,v 1.9 1999/12/05 19:37:47 mickey Exp $
+# $OpenBSD: instbin.conf,v 1.10 2000/06/09 17:42:53 mickey Exp $
#
# instbin.conf - unified binary for the inst/upgr floppies
#
@@ -6,7 +6,7 @@
srcdirs distrib/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
srcdirs usr.sbin/pppd sys/arch/i386/stand
-progs cat chmod chown cp dd df disklabel dhclient ed
+progs cat chmod cp dd df disklabel dhclient ed
progs fsck_ffs ftp fdisk
progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs
@@ -14,7 +14,8 @@ progs mv newfs pax ksh ping reboot rm route
progs sed sleep stty tip umount
progs rsh restore gzip sort grep installboot
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln less more
ln pax tar
diff --git a/distrib/i386/floppies/common/list b/distrib/i386/floppies/common/list
index 334d7f4c489..7d774050c97 100644
--- a/distrib/i386/floppies/common/list
+++ b/distrib/i386/floppies/common/list
@@ -1,9 +1,10 @@
-# $OpenBSD: list,v 1.11 1999/12/05 19:37:47 mickey Exp $
+# $OpenBSD: list,v 1.12 2000/06/09 17:42:53 mickey Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/cpio bin/pax bin/tar
LINK instbin bin/dd
@@ -17,6 +18,7 @@ LINK instbin bin/rm
LINK instbin bin/sh bin/ksh
LINK instbin bin/sleep
LINK instbin bin/stty
+LINK instbin sbin/chown
LINK instbin sbin/disklabel
LINK instbin sbin/dhclient
LINK instbin sbin/fdisk
@@ -46,7 +48,6 @@ LINK instbin usr/bin/less usr/bin/more
LINK instbin usr/bin/rsh
LINK instbin usr/bin/sed
LINK instbin usr/bin/sort
-LINK instbin usr/sbin/chown usr/sbin/chgrp
LINK instbin usr/mdec/installboot
SPECIAL /bin/rm instbin
diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list
index 87f6f0fa56e..a0d2c0c279c 100644
--- a/distrib/mac68k/ramdisk/list
+++ b/distrib/mac68k/ramdisk/list
@@ -1,8 +1,9 @@
-# $OpenBSD: list,v 1.1 1999/06/13 10:33:31 downsj Exp $
+# $OpenBSD: list,v 1.2 2000/06/09 17:42:53 mickey Exp $
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
LINK raminst bin/chmod
+LINK raminst bin/chgrp
LINK raminst bin/cp
LINK raminst bin/df
LINK raminst bin/dd
@@ -23,6 +24,7 @@ LINK raminst bin/stty
LINK raminst bin/sync
LINK raminst bin/test
LINK raminst bin/[
+LINK raminst sbin/chown
LINK raminst sbin/disklabel
LINK raminst sbin/fsck
LINK raminst sbin/halt
@@ -41,7 +43,6 @@ LINK raminst sbin/reboot
LINK raminst sbin/route
LINK raminst sbin/slattach
LINK raminst sbin/umount
-LINK raminst usr/bin/chgrp
LINK raminst usr/bin/ftp
LINK raminst usr/bin/egrep
LINK raminst usr/bin/grep
@@ -53,7 +54,6 @@ LINK raminst bin/pax
LINK raminst usr/bin/tar
LINK raminst usr/bin/tip
LINK raminst usr/sbin/chat
-LINK raminst usr/sbin/chown
LINK raminst usr/sbin/pppd
LINK raminst usr/bin/vi
SPECIAL /bin/rm raminst
diff --git a/distrib/mac68k/ramdisk/raminst.conf b/distrib/mac68k/ramdisk/raminst.conf
index 3d890db1c89..e989c3bf944 100644
--- a/distrib/mac68k/ramdisk/raminst.conf
+++ b/distrib/mac68k/ramdisk/raminst.conf
@@ -1,5 +1,5 @@
#
-# $OpenBSD: raminst.conf,v 1.1 1999/06/13 10:33:31 downsj Exp $
+# $OpenBSD: raminst.conf,v 1.2 2000/06/09 17:42:53 mickey Exp $
#
# raminst.conf - unified binary for the RAM disk
#
@@ -7,7 +7,7 @@
srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd
srcdirs usr.bin/vi
-progs cat chat chmod chown chroot cp dd df disklabel ed expr fsck_ffs
+progs cat chat chmod chroot cp dd df disklabel ed expr fsck_ffs
progs ftp grep gzip hostname ifconfig init kill less ln ls mkdir mknod mount
progs mount_cd9660 mount_ffs mount_kernfs mount_nfs
progs mv newfs pax ksh ping pppd pwd reboot rm route build
@@ -15,7 +15,8 @@ progs sed shutdown slattach sleep sort strings stty sync test tip umount
progs restore
ln pax tar
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln ksh sh
ln ksh -sh # init invokes the shell this way
diff --git a/distrib/miniroot/list b/distrib/miniroot/list
index 2ff84161295..87093f76435 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.16 2000/04/25 22:01:58 millert Exp $
+# $OpenBSD: list,v 1.17 2000/06/09 17:42:53 mickey Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -8,6 +8,7 @@ SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin usr.bin/vi
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/dd
LINK instbin bin/df
@@ -25,6 +26,7 @@ LINK instbin bin/ksh bin/sh
LINK instbin bin/stty
LINK instbin bin/sleep
LINK instbin bin/sync
+LINK instbin sbin/chown
LINK instbin sbin/fsck_ffs sbin/fsck
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/ifconfig
@@ -42,7 +44,6 @@ LINK instbin sbin/shutdown
LINK instbin sbin/slattach
LINK instbin sbin/umount
SYMLINK ../../instbin usr/bin/chflags
-SYMLINK ../../instbin usr/sbin/chown usr/bin/chgrp
SYMLINK ../../instbin usr/sbin/chroot
SYMLINK ../../instbin usr/bin/ftp
SYMLINK ../../instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list
index e4bc81a5599..8574e57e302 100644
--- a/distrib/mvme68k/ramdisk/list
+++ b/distrib/mvme68k/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.5 2000/01/24 04:50:26 smurph Exp $
+# $OpenBSD: list,v 1.6 2000/06/09 17:42:53 mickey Exp $
SRCDIRS distrib/special
SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
SRCDIRS usr.sbin/pppd
@@ -8,6 +8,7 @@ SRCDIRS usr.bin/vi
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/dd
LINK instbin bin/df
@@ -27,6 +28,7 @@ ARGVLINK ksh -sh
LINK instbin bin/stty
#LINK instbin bin/sync
LINK instbin bin/test bin/[
+LINK instbin sbin/chown
#LINK instbin sbin/dhclient
LINK instbin sbin/disklabel
LINK instbin sbin/fsck
@@ -57,7 +59,6 @@ LINK instbin usr/bin/tr
LINK instbin usr/sbin/chat
LINK instbin usr/sbin/pppd
SYMLINK ../../instbin usr/bin/build usr/bin/vi
-SYMLINK ../../instbin usr/sbin/chown usr/bin/chgrp
SYMLINK ../../instbin usr/bin/ftp
SYMLINK ../../instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
SYMLINK ../../instbin usr/bin/sed
diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list
index a96f42f2b7e..766871845f6 100644
--- a/distrib/mvme88k/ramdisk/list
+++ b/distrib/mvme88k/ramdisk/list
@@ -1,8 +1,9 @@
-# $OpenBSD: list,v 1.2 2000/01/24 04:51:55 smurph Exp $
+# $OpenBSD: list,v 1.3 2000/06/09 17:42:53 mickey Exp $
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
LINK raminst bin/chmod
+LINK raminst bin/chgrp
LINK raminst bin/cp
LINK raminst bin/df
LINK raminst bin/dd
@@ -26,6 +27,7 @@ LINK raminst bin/sync
LINK raminst bin/test
LINK raminst bin/pax bin/tar bin/cpio
LINK raminst bin/[
+LINK raminst sbin/chown
LINK raminst sbin/disklabel
LINK raminst sbin/fsck
LINK raminst sbin/halt
@@ -44,7 +46,6 @@ LINK raminst sbin/route
LINK raminst sbin/slattach
LINK raminst sbin/umount
LINK raminst usr/bin/awk
-LINK raminst usr/bin/chgrp
LINK raminst usr/bin/cut
LINK raminst usr/bin/ftp
LINK raminst usr/bin/egrep
@@ -57,7 +58,6 @@ LINK raminst usr/bin/sort
LINK raminst usr/bin/tar
LINK raminst usr/bin/pax
LINK raminst usr/bin/tip
-LINK raminst usr/sbin/chown
SPECIAL /bin/rm raminst
# copy the MAKEDEV script and make some devices
diff --git a/distrib/mvme88k/ramdisk/raminst.conf b/distrib/mvme88k/ramdisk/raminst.conf
index e4b96ddf2a5..ad2b0fb3d7d 100644
--- a/distrib/mvme88k/ramdisk/raminst.conf
+++ b/distrib/mvme88k/ramdisk/raminst.conf
@@ -1,5 +1,5 @@
#
-# $OpenBSD: raminst.conf,v 1.2 2000/01/24 04:51:55 smurph Exp $
+# $OpenBSD: raminst.conf,v 1.3 2000/06/09 17:42:54 mickey Exp $
#
# ram.conf - unified binary for the RAM disk
#
@@ -8,7 +8,7 @@ srcdirs distrib/special
srcdirs bin sbin usr.bin usr.sbin usr.bin/vi
srcdirs gnu/usr.bin
-progs awk cat chmod chown cut cp dd df disklabel ed grep expr fsck_ffs ftp
+progs awk cat chmod cut cp dd df disklabel ed grep expr fsck_ffs ftp
progs gzip ifconfig init hostname kill ln ls mkdir mknod less mount
progs mount_cd9660 mount_kernfs mount_ffs mount_msdos mount_nfs mt
progs mv newfs pwd reboot rm route sed sleep ksh slattach sort stty
@@ -17,7 +17,8 @@ progs sync pax test tip umount build
ln build vi
ln pax tar
ln pax cpio
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln less more
ln ksh sh
diff --git a/distrib/pc532/floppies/inst-common/instbin.conf b/distrib/pc532/floppies/inst-common/instbin.conf
index 889282d63eb..160d535dc00 100644
--- a/distrib/pc532/floppies/inst-common/instbin.conf
+++ b/distrib/pc532/floppies/inst-common/instbin.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: instbin.conf,v 1.6 2000/03/01 22:10:07 todd Exp $
+# $OpenBSD: instbin.conf,v 1.7 2000/06/09 17:42:54 mickey Exp $
#
# kcbin.conf - unified binary for the kc floppy
#
@@ -6,7 +6,7 @@
srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin games distrib/pc532/floppies
progs chat download less pppstats vi
-progs basename bc bim cat chmod chown chroot cp
+progs basename bc bim cat chmod chroot cp
progs date dd df dirname disklabel dmesg domainname dump
progs expr factor find fsck_ffs ftp
progs gzip hostname hexdump ifconfig init
@@ -25,7 +25,8 @@ special vi srcdir usr.bin/vi/build
ln fsck_ffs fsck
ln less more
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln dump rdump
ln gzip gzcat gunzip
ln sh -sh # init invokes the shell this way
diff --git a/distrib/pc532/floppies/inst-common/list b/distrib/pc532/floppies/inst-common/list
index ae8b28f7aec..1f75f7f3b86 100644
--- a/distrib/pc532/floppies/inst-common/list
+++ b/distrib/pc532/floppies/inst-common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.7 2000/03/01 22:10:07 todd Exp $
+# $OpenBSD: list,v 1.8 2000/06/09 17:42:54 mickey Exp $
# copy the MAKEDEV script and make some devices
COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
@@ -23,6 +23,7 @@ COPY ${OBJDIR}/netbsd.gz netbsd.gz
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/date
LINK instbin bin/dd
@@ -47,6 +48,7 @@ LINK instbin bin/sync
LINK instbin bin/test
LINK instbin bin/[
LINK instbin sbin/bim
+LINK instbin sbin/chown
LINK instbin sbin/disklabel
LINK instbin sbin/dmesg
LINK instbin sbin/dump
@@ -71,7 +73,6 @@ LINK instbin sbin/slattach
LINK instbin sbin/swapon
LINK instbin sbin/umount
SYMLINK /instbin usr/bin/basename
-SYMLINK /instbin usr/bin/chgrp
SYMLINK /instbin usr/bin/dirname
SYMLINK /instbin usr/bin/hexdump
SYMLINK /instbin usr/bin/ex
@@ -91,7 +92,6 @@ SYMLINK /instbin usr/bin/vi
SYMLINK /instbin usr/bin/view
SYMLINK /instbin usr/games/factor
SYMLINK /instbin usr/sbin/chat
-SYMLINK /instbin usr/sbin/chown
SYMLINK /instbin usr/sbin/chroot
SYMLINK /instbin usr/sbin/kvm_mkdb
SYMLINK /instbin usr/sbin/pppd
diff --git a/distrib/pmax/ramdisk/list b/distrib/pmax/ramdisk/list
index d83b48ae62f..9b727028416 100644
--- a/distrib/pmax/ramdisk/list
+++ b/distrib/pmax/ramdisk/list
@@ -1,11 +1,12 @@
#
-# $OpenBSD: list,v 1.1 1998/11/09 06:16:12 millert Exp $
+# $OpenBSD: list,v 1.2 2000/06/09 17:42:54 mickey Exp $
#
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
LINK raminst bin/chmod
+LINK raminst bin/chgrp
LINK raminst bin/cp
LINK raminst bin/cpio
LINK raminst bin/dd
@@ -22,6 +23,7 @@ LINK raminst bin/rm
LINK raminst bin/stty
LINK raminst bin/sleep
LINK raminst bin/tar
+LINK raminst sbin/chown
LINK raminst sbin/disklabel
LINK raminst sbin/fsck
LINK raminst sbin/halt
@@ -39,7 +41,6 @@ LINK raminst sbin/newfs
LINK raminst sbin/reboot
LINK raminst sbin/route
LINK raminst sbin/umount
-LINK raminst usr/bin/chgrp
LINK raminst usr/bin/ftp
LINK raminst usr/bin/egrep
LINK raminst usr/bin/fgrep
@@ -49,7 +50,6 @@ LINK raminst usr/bin/less
LINK raminst usr/bin/more
LINK raminst usr/bin/sed
LINK raminst usr/bin/pax
-LINK raminst usr/sbin/chown
SPECIAL /bin/rm raminst
# copy the MAKEDEV script and make some devices
diff --git a/distrib/pmax/ramdisk/raminst.conf b/distrib/pmax/ramdisk/raminst.conf
index a035eaa15a7..949ba5dae18 100644
--- a/distrib/pmax/ramdisk/raminst.conf
+++ b/distrib/pmax/ramdisk/raminst.conf
@@ -1,18 +1,19 @@
#
-# $OpenBSD: raminst.conf,v 1.1 1998/11/09 06:16:13 millert Exp $
+# $OpenBSD: raminst.conf,v 1.2 2000/06/09 17:42:54 mickey Exp $
#
# raminst.conf - unified binary for the RAM disk
#
srcdirs distrib/special bin sbin usr.bin usr.sbin gnu/usr.bin
-progs cat chmod chown cp dd df disklabel ed grep fsck_ffs ftp
+progs cat chmod cp dd df disklabel ed grep fsck_ffs ftp
progs gzip ifconfig init less ln ls mkdir mknod mount
progs mount_cd9660 mount_kernfs mount_ffs mount_nfs mv newfs ksh
progs reboot rm route rsh sed sleep stty pax umount dhclient expr
#progs slattach sync tip
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln ksh sh
ln ksh -sh # init invokes the shell this way
diff --git a/distrib/pmax/simpleroot/list b/distrib/pmax/simpleroot/list
index 817055f3946..fd0299a702f 100644
--- a/distrib/pmax/simpleroot/list
+++ b/distrib/pmax/simpleroot/list
@@ -35,8 +35,6 @@ usr/lib/libm.so.?.?
usr/lib/libutil.so.?.?
usr/libexec/ld.so
usr/mdec
-usr/sbin/chgrp
-usr/sbin/chown
usr/sbin/chroot
usr/sbin/rdate
usr/share/misc/termcap
diff --git a/distrib/powerpc/ramdisk/list b/distrib/powerpc/ramdisk/list
index 0940cc2e7b2..d0bd950b090 100644
--- a/distrib/powerpc/ramdisk/list
+++ b/distrib/powerpc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.11 2000/01/24 03:46:55 rahnds Exp $
+# $OpenBSD: list,v 1.12 2000/06/09 17:42:54 mickey Exp $
SRCDIRS distrib/special
SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
@@ -9,6 +9,7 @@ SRCDIRS usr.sbin/pppd
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/dd
LINK instbin bin/df
@@ -28,6 +29,7 @@ LINK instbin bin/sleep
LINK instbin bin/stty
LINK instbin bin/sync
LINK instbin bin/test bin/[
+LINK instbin sbin/chown
LINK instbin sbin/disklabel
LINK instbin sbin/fdisk
LINK instbin sbin/fsck
@@ -60,7 +62,6 @@ LINK instbin usr/bin/sed
LINK instbin usr/bin/sort
LINK instbin usr/bin/tip
LINK instbin usr/sbin/chat
-LINK instbin usr/sbin/chown usr/sbin/chgrp
LINK instbin usr/sbin/pppd
#SYMLINK ../../instbin usr/bin/build usr/bin/vi
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index 84af13996d8..f579da6cefb 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.9 2000/04/25 22:01:59 millert Exp $
+# $OpenBSD: list,v 1.10 2000/06/09 17:42:55 mickey Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -9,6 +9,7 @@ SRCDIRS usr.bin/vi
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/dd
LINK instbin bin/df
@@ -29,6 +30,7 @@ LINK instbin bin/sync
LINK instbin sbin/fsck_ffs sbin/fsck
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/ifconfig
+LINK instbin sbin/chown
LINK instbin sbin/dhclient
LINK instbin sbin/init
LINK instbin sbin/mknod
@@ -41,7 +43,6 @@ LINK instbin sbin/newfs sbin/mount_mfs
LINK instbin sbin/ping
LINK instbin sbin/route
LINK instbin sbin/umount
-SYMLINK ../../instbin usr/sbin/chown usr/bin/chgrp
SYMLINK ../../instbin usr/bin/ftp
SYMLINK ../../instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
SYMLINK ../../instbin usr/bin/sed
diff --git a/distrib/sun3/common/mini_bin.list b/distrib/sun3/common/mini_bin.list
index d1e74e705f8..73d6ae36ba9 100644
--- a/distrib/sun3/common/mini_bin.list
+++ b/distrib/sun3/common/mini_bin.list
@@ -1,5 +1,5 @@
#
-# $OpenBSD: mini_bin.list,v 1.3 2000/03/01 22:10:10 todd Exp $
+# $OpenBSD: mini_bin.list,v 1.4 2000/06/09 17:42:55 mickey Exp $
# $NetBSD: mini_bin.list,v 1.2 1995/11/21 21:18:56 gwr Exp $
#
@@ -10,6 +10,7 @@
COPY ${DESTDIR}/bin/cat bin
COPY ${DESTDIR}/bin/chmod bin
+LINK bin/chmod bin/chgrp
COPY ${DESTDIR}/bin/cp bin
COPY ${DESTDIR}/bin/date bin
COPY ${DESTDIR}/bin/dd bin
diff --git a/distrib/sun3/common/mini_sbin.list b/distrib/sun3/common/mini_sbin.list
index 447399fcbde..e106bd5ab44 100644
--- a/distrib/sun3/common/mini_sbin.list
+++ b/distrib/sun3/common/mini_sbin.list
@@ -1,5 +1,5 @@
#
-# $OpenBSD: mini_sbin.list,v 1.3 2000/03/01 22:10:10 todd Exp $
+# $OpenBSD: mini_sbin.list,v 1.4 2000/06/09 17:42:55 mickey Exp $
# $NetBSD: mini_sbin.list,v 1.2 1995/11/21 21:18:57 gwr Exp $
#
@@ -7,6 +7,7 @@
# miniroot files from /sbin:
+SYMLINK bin/chmod sbin/chown
COPY ${DESTDIR}/sbin/disklabel sbin
COPY ${DESTDIR}/sbin/dmesg sbin
diff --git a/distrib/sun3/common/mini_usr.conf b/distrib/sun3/common/mini_usr.conf
index 7fcef168d5a..d32148be362 100644
--- a/distrib/sun3/common/mini_usr.conf
+++ b/distrib/sun3/common/mini_usr.conf
@@ -1,5 +1,5 @@
#
-# $OpenBSD: mini_usr.conf,v 1.4 2000/03/01 22:10:10 todd Exp $
+# $OpenBSD: mini_usr.conf,v 1.5 2000/06/09 17:42:55 mickey Exp $
# $NetBSD: mini_usr.conf,v 1.2.6.1 1996/08/29 03:12:10 gwr Exp $
#
# common/mini_usr.conf
@@ -18,7 +18,7 @@ srcdirs bin
progs rcp
srcdirs usr.sbin
-progs bad144 chown chroot eeprom rdate update
+progs bad144 chroot eeprom rdate update
srcdirs usr.bin
progs basename chflags cksum cmp cut ftp
@@ -27,5 +27,3 @@ progs rsh sed strings tftp
srcdirs gnu/usr.bin
progs sort
-ln chown chgrp
-
diff --git a/distrib/sun3/common/mini_usr.list b/distrib/sun3/common/mini_usr.list
index 9e94496acac..83496fa6625 100644
--- a/distrib/sun3/common/mini_usr.list
+++ b/distrib/sun3/common/mini_usr.list
@@ -1,5 +1,5 @@
#
-# $OpenBSD: mini_usr.list,v 1.4 2000/03/01 22:10:10 todd Exp $
+# $OpenBSD: mini_usr.list,v 1.5 2000/06/09 17:42:55 mickey Exp $
# $NetBSD: mini_usr.list,v 1.2.6.1 1996/08/29 03:12:45 gwr Exp $
#
@@ -14,7 +14,6 @@ LINK mini_usr bin/rcp
# usr/sbin:
LINK mini_usr usr/sbin/bad144
-LINK mini_usr usr/sbin/chown
LINK mini_usr usr/sbin/chroot
LINK mini_usr usr/sbin/eeprom
LINK mini_usr usr/sbin/rdate
@@ -24,7 +23,6 @@ LINK mini_usr usr/sbin/update
LINK mini_usr usr/bin/basename
LINK mini_usr usr/bin/chflags
-LINK mini_usr usr/bin/chgrp
LINK mini_usr usr/bin/cksum
LINK mini_usr usr/bin/cmp
LINK mini_usr usr/bin/cut
diff --git a/distrib/sun3/ramdisk/list b/distrib/sun3/ramdisk/list
index 83e2bf3b045..3232d240eac 100644
--- a/distrib/sun3/ramdisk/list
+++ b/distrib/sun3/ramdisk/list
@@ -1,8 +1,9 @@
-# $OpenBSD: list,v 1.1 1998/08/23 18:09:06 kstailey Exp $
+# $OpenBSD: list,v 1.2 2000/06/09 17:42:55 mickey Exp $
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
LINK raminst bin/chmod
+LINK raminst bin/chgrp
LINK raminst bin/cp
LINK raminst bin/df
LINK raminst bin/dd
@@ -23,6 +24,7 @@ LINK raminst bin/stty
LINK raminst bin/sync
LINK raminst bin/test
LINK raminst bin/[
+LINK raminst sbin/chown
LINK raminst sbin/disklabel
LINK raminst sbin/fsck
LINK raminst sbin/halt
@@ -42,7 +44,6 @@ LINK raminst sbin/route
LINK raminst sbin/slattach
LINK raminst sbin/umount
LINK raminst usr/bin/awk
-LINK raminst usr/bin/chgrp
LINK raminst usr/bin/cut
LINK raminst usr/bin/ftp
LINK raminst usr/bin/egrep
@@ -55,7 +56,6 @@ LINK raminst bin/pax
LINK raminst usr/bin/tar
LINK raminst usr/bin/tip
LINK raminst usr/sbin/chat
-LINK raminst usr/sbin/chown
LINK raminst usr/sbin/pppd
LINK raminst usr/bin/vi
SPECIAL /bin/rm raminst
diff --git a/distrib/sun3/ramdisk/raminst.conf b/distrib/sun3/ramdisk/raminst.conf
index abc12b19358..00649029260 100644
--- a/distrib/sun3/ramdisk/raminst.conf
+++ b/distrib/sun3/ramdisk/raminst.conf
@@ -1,5 +1,5 @@
#
-# $OpenBSD: raminst.conf,v 1.1 1998/08/23 18:09:07 kstailey Exp $
+# $OpenBSD: raminst.conf,v 1.2 2000/06/09 17:42:55 mickey Exp $
#
# raminst.conf - unified binary for the RAM disk
#
@@ -7,7 +7,7 @@
srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd
srcdirs usr.bin/vi
-progs awk cat chat chmod chown chroot cp cut dd df disklabel ed expr fsck_ffs
+progs awk cat chat chmod chroot cp cut dd df disklabel ed expr fsck_ffs
progs ftp grep gzip hostname ifconfig init kill less ln ls mkdir mknod mount
progs mount_cd9660 mount_ffs mount_kernfs mount_nfs
progs mv newfs pax ksh ping pppd pwd reboot rm route build
@@ -16,7 +16,8 @@ progs restore
ln pax tar
ln pax cpio
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln fsck_ffs fsck
ln ksh sh
ln ksh -sh # init invokes the shell this way
diff --git a/distrib/vax/inst-common/instbin.conf b/distrib/vax/inst-common/instbin.conf
index 4eaac659320..a4ac3635ae8 100644
--- a/distrib/vax/inst-common/instbin.conf
+++ b/distrib/vax/inst-common/instbin.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: instbin.conf,v 1.5 2000/03/01 22:10:14 todd Exp $
+# $OpenBSD: instbin.conf,v 1.6 2000/06/09 17:42:55 mickey Exp $
#
# kcbin.conf - unified binary for the kc floppy
#
@@ -6,12 +6,13 @@
srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
srcdirs /usr/src/gnu/usr.bin
-progs gawk cat chmod chown chroot cp df disklabel ed expr fsck ftp
+progs gawk cat chmod chroot cp df disklabel ed expr fsck ftp
progs ifconfig init ln ls mkdir mknod more mount mt dd
progs mount_ffs mount_nfs mv newfs reboot rm route sed sh shutdown
progs slattach strings stty sync tar test umount update
-ln chown chgrp
+ln chmod chgrp
+ln chmod chown
ln mount_ffs ffs
ln mount_nfs nfs
ln gawk awk
diff --git a/distrib/vax/inst-common/list b/distrib/vax/inst-common/list
index 6975333198b..1123be52ff4 100644
--- a/distrib/vax/inst-common/list
+++ b/distrib/vax/inst-common/list
@@ -1,9 +1,10 @@
-# $OpenBSD: list,v 1.6 2000/03/01 22:10:14 todd Exp $
+# $OpenBSD: list,v 1.7 2000/06/09 17:42:56 mickey Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
+LINK instbin bin/chgrp
LINK instbin bin/cp
LINK instbin bin/dd
LINK instbin bin/df
@@ -21,6 +22,7 @@ LINK instbin bin/stty
LINK instbin bin/sync
LINK instbin bin/test
LINK instbin bin/[
+LINK instbin sbin/chown
LINK instbin sbin/disklabel
LINK instbin sbin/fsck
LINK instbin sbin/halt
@@ -37,14 +39,12 @@ LINK instbin sbin/shutdown
LINK instbin sbin/slattach
LINK instbin sbin/umount
LINK instbin usr/bin/awk
-LINK instbin usr/bin/chgrp
LINK instbin usr/bin/ftp
LINK instbin usr/bin/more
LINK instbin usr/bin/sed
LINK instbin usr/bin/strings
LINK instbin usr/bin/tar
# LINK instbin usr/sbin/bad144
-LINK instbin usr/sbin/chown
LINK instbin usr/sbin/chroot
LINK instbin usr/sbin/update
SPECIAL /bin/rm instbin