From: Zachary Storer Date: Sat, 26 Jul 2014 20:52:16 +0000 (-0600) Subject: Remove the minix 'cpdir' command alias. X-Git-Tag: v3.3.0~93 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=9abd355d6b24fc10bc7a9e75a004b537dd99fcdb;p=minix.git Remove the minix 'cpdir' command alias. Change-Id: If51dcc8cb2f46e375638f1e2e4e8baddb790ab2c --- diff --git a/commands/cp/Makefile b/commands/cp/Makefile index 9d9b6bf5c..51fd07079 100644 --- a/commands/cp/Makefile +++ b/commands/cp/Makefile @@ -4,6 +4,4 @@ PROG= cp BINDIR= /bin MAN= -LINKS+= ${BINDIR}/cp ${BINDIR}/cpdir - .include diff --git a/commands/setup/setup.sh b/commands/setup/setup.sh index 173aacbe5..9b9201598 100644 --- 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 7a24d582f..414e95fad 100644 --- 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 c41b16533..412dcec27 100644 --- 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 aed74a1ab..6a7b89f8e 100644 --- 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 e06223f89..73ffb8af1 100644 --- 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