diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-10 12:46:03 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-10 12:46:03 +0000 |
| commit | 78121a0c3d633d344c4092336d357036c0e19f96 (patch) | |
| tree | c6691bd7e380d723ada73f9b61dc4ef7634ee081 /manifest | |
| parent | 471ea867225b8c01fb430e738f6cf835294c99fc (diff) | |
| parent | 19ee9cd1f5161e227951200cab5ecbff45fd5d71 (diff) | |
| download | illumos-joyent-78121a0c3d633d344c4092336d357036c0e19f96.tar.gz | |
[illumos-gate merge]
commit 19ee9cd1f5161e227951200cab5ecbff45fd5d71
12277 /proc/<PID>/fdinfo should resolve paths relative to current process
commit 52aec5b9758f6352670ab269980b437a987f4822
12276 smatch-clean sockfs
commit 0dfe541e13279d277d838d6a27e55188b9486cb1
11083 support NFS server in zone
commit d8ab6e129d75d7c3f21a7909bf811a3de65faea8
12235 Add libzutil for libzfs or libzpool consumers
commit fdefee4c75361dc5ea202f7e1f7c49f8a27ea043
12266 loader: rewrite zfs reader zap code to use malloc
commit 8af765f5897d30449b941438e8d833f02dac74f8
12252 remove sunfire-specific code from kstat(1m)
commit 34173ec8d0147391124bee4bbc60ac00807c0377
12284 errors in compress(1) and pack(1) man pages
Conflicts:
usr/src/uts/common/klm/nlm_impl.h
usr/src/uts/common/fs/nfs/nfs_server.c
usr/src/lib/Makefile
usr/src/cmd/fs.d/nfs/svc/nfs-server
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -1379,6 +1379,8 @@ f lib/amd64/libzfs.so.1 0755 root bin s lib/amd64/libzfs.so=libzfs.so.1 s lib/amd64/libzfs_core.so.1=../../usr/lib/amd64/libzfs_core.so.1 s lib/amd64/libzfs_core.so=../../usr/lib/amd64/libzfs_core.so +f lib/amd64/libzutil.so.1 0755 root bin +s lib/amd64/libzutil.so=libzutil.so.1 f lib/amd64/nss_compat.so.1 0755 root bin f lib/amd64/nss_dns.so.1 0755 root bin f lib/amd64/nss_files.so.1 0755 root bin @@ -1584,6 +1586,8 @@ f lib/libzfs.so.1 0755 root bin s lib/libzfs.so=libzfs.so.1 s lib/libzfs_core.so.1=../usr/lib/libzfs_core.so s lib/libzfs_core.so=../usr/lib/libzfs_core.so +f lib/libzutil.so.1 0755 root bin +s lib/libzutil.so=libzutil.so.1 d lib/mpxio 0755 root bin f lib/mpxio/stmsboot_util 0555 root bin f lib/nss_compat.so.1 0755 root bin @@ -5430,6 +5434,8 @@ f usr/lib/amd64/libzonecfg.so.1 0755 root bin s usr/lib/amd64/libzonecfg.so=libzonecfg.so.1 f usr/lib/amd64/libzpool.so.1 0755 root bin s usr/lib/amd64/libzpool.so=libzpool.so.1 +s usr/lib/amd64/libzutil.so.1=../../../lib/amd64/libzutil.so.1 +s usr/lib/amd64/libzutil.so=../../../lib/amd64/libzutil.so.1 f usr/lib/amd64/lx_brand.so.1 0755 root sys f usr/lib/amd64/madv.so.1 0755 root bin f usr/lib/amd64/mpss.so.1 0755 root bin @@ -6957,6 +6963,8 @@ f usr/lib/libzoneinfo.so.1 0755 root bin s usr/lib/libzoneinfo.so=libzoneinfo.so.1 f usr/lib/libzpool.so.1 0755 root bin s usr/lib/libzpool.so=libzpool.so.1 +s usr/lib/libzutil.so.1=../../lib/libzutil.so.1 +s usr/lib/libzutil.so=../../lib/libzutil.so.1 d usr/lib/link_audit 0755 root bin s usr/lib/link_audit/32=. s usr/lib/link_audit/64=amd64 @@ -10127,6 +10135,9 @@ f usr/lib/netsvc/yp/ypxfr_2perday 0555 root sys f usr/lib/netsvc/yp/ypxfrd 0555 root sys f usr/lib/newsyslog 0555 root sys d usr/lib/nfs 0755 root sys +d usr/lib/nfs/dtrace 0755 root sys +f usr/lib/nfs/dtrace/nfs-time.d 0555 root bin +f usr/lib/nfs/dtrace/nfs-trace.d 0555 root bin f usr/lib/nfs/libmapid.so.1 0755 root bin s usr/lib/nfs/libmapid.so=libmapid.so.1 f usr/lib/nfs/lockd 0555 root bin |