diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-08-12 11:51:09 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-08-12 11:51:09 +0000 |
| commit | 09f210323354e07890b312da9b4f5e33ae6b6df5 (patch) | |
| tree | b1adf04da75c4c474f185ce5f92a18afbaa86106 /usr/src/pkg | |
| parent | 1fc24ed72de4ac8eab15db9b0af90b3e9654262b (diff) | |
| parent | 0ac8993002ee179cc3289243a0fc956ee0db04da (diff) | |
| download | illumos-joyent-09f210323354e07890b312da9b4f5e33ae6b6df5.tar.gz | |
[illumos-gate merge]release-20200813
commit 0ac8993002ee179cc3289243a0fc956ee0db04da
13013 Port OpenZFS zpool label clear improvements
13012 zpool_read_label semantics should match OpenZFS
commit 0904e7ecf266ebe6844dfc4b178441dc8d81296b
12944 remove long obsolete libsys
Diffstat (limited to 'usr/src/pkg')
| -rw-r--r-- | usr/src/pkg/manifests/system-library.man3lib.inc | 1 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-library.mf | 2 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-test-zfstest.mf | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/usr/src/pkg/manifests/system-library.man3lib.inc b/usr/src/pkg/manifests/system-library.man3lib.inc index bf60cd2b7a..750b223713 100644 --- a/usr/src/pkg/manifests/system-library.man3lib.inc +++ b/usr/src/pkg/manifests/system-library.man3lib.inc @@ -74,7 +74,6 @@ file path=usr/share/man/man3lib/libsecdb.3lib file path=usr/share/man/man3lib/libsendfile.3lib file path=usr/share/man/man3lib/libsip.3lib file path=usr/share/man/man3lib/libsocket.3lib -file path=usr/share/man/man3lib/libsys.3lib file path=usr/share/man/man3lib/libsysevent.3lib file path=usr/share/man/man3lib/libthread.3lib file path=usr/share/man/man3lib/libtsnet.3lib diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf index 6ae9fc7378..1ab189080b 100644 --- a/usr/src/pkg/manifests/system-library.mf +++ b/usr/src/pkg/manifests/system-library.mf @@ -467,7 +467,6 @@ file path=usr/lib/libsldap.so.1 file path=usr/lib/libsmbios.so.1 file path=usr/lib/libsoftcrypto.so.1 file path=usr/lib/libsum.so.1 -file path=usr/lib/libsys.so.1 $(sparc_ONLY)file path=usr/lib/libv12n.so.1 file path=usr/lib/libvolmgt.so.1 file path=usr/lib/libwrap.so.1.0 @@ -1209,7 +1208,6 @@ link path=usr/lib/libsmbios.so target=libsmbios.so.1 link path=usr/lib/libsocket.so target=../../lib/libsocket.so.1 link path=usr/lib/libsocket.so.1 target=../../lib/libsocket.so.1 link path=usr/lib/libsoftcrypto.so target=./libsoftcrypto.so.1 -link path=usr/lib/libsys.so target=./libsys.so.1 link path=usr/lib/libsysevent.so target=../../lib/libsysevent.so.1 link path=usr/lib/libsysevent.so.1 target=../../lib/libsysevent.so.1 link path=usr/lib/libtermcap.so target=../../lib/libtermcap.so.1 diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf index 662050d421..51a81cbc04 100644 --- a/usr/src/pkg/manifests/system-test-zfstest.mf +++ b/usr/src/pkg/manifests/system-test-zfstest.mf @@ -1893,6 +1893,12 @@ file \ file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_exported \ mode=0555 +file \ + path=opt/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_removed \ + mode=0555 +file \ + path=opt/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_valid \ + mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_offline/cleanup \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_offline/setup \ |