summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-03-08 12:58:09 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-03-08 12:58:09 +0000
commitab5c28c720db708bc348bdd2d22dfda8f16ea0f9 (patch)
tree7f2493ed646db49d6c47215efc91f64d8169d92f /manifest
parent4e60424f28371f62aa78ec19751822a218d10eb5 (diff)
parent8f5edf1f887948e6be5982cbe7f196909927af91 (diff)
downloadillumos-joyent-ab5c28c720db708bc348bdd2d22dfda8f16ea0f9.tar.gz
[illumos-gate merge]
commit 8f5edf1f887948e6be5982cbe7f196909927af91 10417 recursive chown should not traverse any symbolic links by default commit 0fa1b3cc784fb6db7999ec330ee54256171c1143 10500 Refactor dmu_recv into its own file commit 051a710dcbf091c85ceb0f5d86bd684a64639477 10504 zfs-test deadlist_lock leaves behind orphan destructive dtrace probe commit cbf54fed071131ba3446db06df29807d639650ab 10125 smatch fixes for cmd-inet Conflicts: usr/src/pkg/manifests/system-test-utiltest.mf usr/src/test/util-tests/tests/Makefile usr/src/uts/common/fs/zfs/dmu_send.c usr/src/uts/common/fs/zfs/dmu_recv.c
Diffstat (limited to 'manifest')
-rw-r--r--manifest4
1 files changed, 2 insertions, 2 deletions
diff --git a/manifest b/manifest
index a0953be15e..4a9a558cb8 100644
--- a/manifest
+++ b/manifest
@@ -20832,8 +20832,8 @@ f usr/xpg4/bin/basename 0555 root bin
f usr/xpg4/bin/batch 0555 root bin
s usr/xpg4/bin/bg=../../bin/alias
s usr/xpg4/bin/cd=../../bin/alias
-f usr/xpg4/bin/chgrp 0555 root bin
-f usr/xpg4/bin/chown 0555 root bin
+s usr/xpg4/bin/chgrp=../../bin/chgrp
+s usr/xpg4/bin/chown=../../bin/chown
s usr/xpg4/bin/command=../../bin/alias
f usr/xpg4/bin/cp 0555 root bin
f usr/xpg4/bin/crontab 4555 root bin