Remove the minix 'cpdir' command alias.

Change-Id: If51dcc8cb2f46e375638f1e2e4e8baddb790ab2c

diff --git a/commands/cp/Makefile b/commands/cp/Makefile
index 9d9b6bf5c81fffa87c9a5fee3f7bb5cdbfaff505..51fd07079807e76e0e62d187124daeeb17106d6c 100644 (file)
--- a/commands/cp/Makefile
+++ b/commands/cp/Makefile
@@ -4,6 +4,4 @@ PROG=   cp
 BINDIR=        /bin
 MAN=
 
-LINKS+=      ${BINDIR}/cp ${BINDIR}/cpdir
-
 .include <bsd.prog.mk>

diff --git a/commands/setup/setup.sh b/commands/setup/setup.sh
index 173aacbe55894065b34d0fbfa9a0feae2152f591..9b92015989d0674cb82564aa882812b1f3d8dbcc 100644 (file)
--- a/commands/setup/setup.sh
+++ b/commands/setup/setup.sh
@@ -697,7 +697,7 @@ mount /dev/$usr /mnt >/dev/null || exit             # Mount the intended /usr.
  list="`ls | fgrep -v install`"
  for d in $list
  do    
-       cpdir -v $d /mnt/$d
+       cp -psmr -v $d /mnt/$d
  done
 ) | progressbar "$USRFILES" || exit    # Copy the usr floppy.
 
@@ -705,7 +705,7 @@ umount /dev/$usr >/dev/null || exit         # Unmount the intended /usr.
 mount /dev/$root /mnt >/dev/null || exit
 
 # Running from the installation CD.
-cpdir -vx / /mnt | progressbar "$ROOTFILES" || exit    
+cp -psmr -vx / /mnt | progressbar "$ROOTFILES" || exit
 chmod o-w /mnt/usr
 cp /mnt/etc/motd.install /mnt/etc/motd
 
@@ -753,7 +753,7 @@ then        if mount /dev/$home /home 2>/dev/null
                do      h=`eval echo "~$u"`
                        if mkdir $h
                        then    echo " * Creating home directory for $u in $h"
-                               cpdir /usr/ast $h
+                               cp -psmr /usr/ast $h
                                chown -R $u:operator $h
                        else    echo " * Couldn't create $h"
                        fi

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 7a24d582fb046cc5b933fb0dadb07c23f3f07b34..414e95fadf198fc37093eae93a2c556fe324f234 100644 (file)
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -15,7 +15,6 @@
 ./bin/chmod                            minix-sys
 ./bin/command                          minix-sys
 ./bin/cp                               minix-sys
-./bin/cpdir                            minix-sys
 ./bin/cpio                             minix-sys
 ./bin/date                             minix-sys
 ./bin/df                               minix-sys
@@ -2243,7 +2242,6 @@
 ./usr/man/man1/compress.1              minix-sys
 ./usr/man/man1/continue.1              minix-sys
 ./usr/man/man1/cp.1                    minix-sys
-./usr/man/man1/cpdir.1                 minix-sys
 ./usr/man/man1/cpio.1                  minix-sys
 ./usr/man/man1/cpp.1                   minix-sys       gcccmds
 ./usr/man/man1/crc.1                   minix-sys

diff --git a/man/man1/Makefile b/man/man1/Makefile
index c41b16533e2556ae98177d450d3b07d65940e7bf..412dcec276f5b2a6a2da74a1d407e28135e4f4c0 100644 (file)
--- a/man/man1/Makefile
+++ b/man/man1/Makefile
@@ -49,7 +49,6 @@ MLINKS += ash.1 umask.1
 MLINKS += ash.1 unset.1
 MLINKS += ash.1 wait.1
 MLINKS += compress.1 uncompress.1
-MLINKS += cp.1 cpdir.1
 MLINKS += svc.1 ci.1
 MLINKS += svc.1 co.1
 

diff --git a/man/man1/synctree.1 b/man/man1/synctree.1
index aed74a1ab3867896748b56ded58a8438c6d7da3c..6a7b89f8eb49fd6d7da9f0aa7324273efcf13a13 100644 (file)
--- a/man/man1/synctree.1
+++ b/man/man1/synctree.1
@@ -45,7 +45,6 @@ Only install newer files, i.e. merge the directory trees.
 Don't ask, think 'yes' on any question.
 .SH "SEE ALSO"
 .BR remsync (1),
-.BR cpdir (1),
 .BR rsh (1),
 .BR rcp (1),
 .BR perror (3).

diff --git a/man/man8/usage.8 b/man/man8/usage.8
index e06223f89ed33b0e4de5c15df70da1754504d565..73ffb8af1495f901699921a7dc2315f503c879a9 100644 (file)
--- a/man/man8/usage.8
+++ b/man/man8/usage.8
@@ -311,7 +311,7 @@ Next make a file system for on-disk /usr and copy the floppy /usr on to it.
 .PP
 .XB "mkfs\0/dev/c0d0p1s2"
 .XB "mount\0/dev/c0d0p1s2\0/mnt"
-.XB "cpdir\0\-v\0/usr\0/mnt"
+.XB "cp -psmr\0\-v\0/usr\0/mnt"
 .PP
 This will create a file system on /dev/c0d0p1s2, mount it on /mnt, and copy the
 contents of the \s-2USR\s+2 floppy onto it.
@@ -330,7 +330,7 @@ fill it from the floppy:
 .XB "mkfs\0\-i\0512\0/dev/c0d0p1s0"
 .XB "mount\0/dev/fd0\0/fd0"
 .XB "mount\0/dev/c0d0p1s0\0/mnt"
-.XB "cpdir\0\-v\0/fd0\0/mnt"
+.XB "cp -psmr\0\-v\0/fd0\0/mnt"
 .XB "umount\0/dev/fd0"
 .PP
 Remove
@@ -646,7 +646,7 @@ This is slower then a RAM disk, but saves a lot of memory.
 The automatic installation script knows how to handle this new situation.
 If you install manually then you have to use
 .PP
-.XB "cpdir\0\-vx\0/\0/mnt"
+.XB "cp -psmr\0\-vx\0/\0/mnt"
 .PP
 to copy the root device to disk.  When it is time to fill /usr and you only
 have one floppy drive then hit DEL to get out of the installation script and