diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-02-22 14:34:53 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-02-22 16:26:56 -0500 |
| commit | 757bbedcc9835b8fd46d17a0137afc7c200aeacd (patch) | |
| tree | e53052dccc792521a7be707686edc6227cbd7a22 | |
| parent | f3389cfd79d6c15fb8cfc797398159f1c8b353b9 (diff) | |
| download | illumos-joyent-757bbedcc9835b8fd46d17a0137afc7c200aeacd.tar.gz | |
13500 Want support for overlay networks (fix mismerge and manifest)
14249 pseudo-terminal nomenclature should reflect POSIX (fix manifest)
| -rw-r--r-- | manifest | 6 | ||||
| -rw-r--r-- | usr/src/lib/libdladm/common/libdladm.c | 3 |
2 files changed, 3 insertions, 6 deletions
@@ -1395,6 +1395,7 @@ f lib/amd64/libuuid.so.1 0755 root bin s lib/amd64/libuuid.so=libuuid.so.1 f lib/amd64/libuutil.so.1 0755 root bin s lib/amd64/libuutil.so=libuutil.so.1 +f lib/amd64/libvarpd.so.1 0755 root bin f lib/amd64/libvmm.so.1 0755 root bin f lib/amd64/libvmmapi.so.1 0755 root bin f lib/amd64/libw.so.1 0755 root bin @@ -1604,6 +1605,7 @@ f lib/libuuid.so.1 0755 root bin s lib/libuuid.so=libuuid.so.1 f lib/libuutil.so.1 0755 root bin s lib/libuutil.so=libuutil.so.1 +f lib/libvarpd.so.1 0755 root bin f lib/libw.so.1 0755 root bin s lib/libw.so=libw.so.1 f lib/libxnet.so.1 0755 root bin @@ -5495,7 +5497,6 @@ s usr/lib/amd64/libuuid.so.1=../../../lib/amd64/libuuid.so.1 s usr/lib/amd64/libuuid.so=../../../lib/amd64/libuuid.so.1 s usr/lib/amd64/libuutil.so.1=../../../lib/amd64/libuutil.so.1 s usr/lib/amd64/libuutil.so=../../../lib/amd64/libuutil.so.1 -f usr/lib/amd64/libvarpd.so.1 0755 root bin f usr/lib/amd64/libvnd.so.1 0755 root bin s usr/lib/amd64/libvnd.so=libvnd.so.1 f usr/lib/amd64/libvolmgt.so.1 0755 root bin @@ -7027,7 +7028,6 @@ s usr/lib/libuuid.so.1=../../lib/libuuid.so.1 s usr/lib/libuuid.so=../../lib/libuuid.so.1 s usr/lib/libuutil.so.1=../../lib/libuutil.so.1 s usr/lib/libuutil.so=../../lib/libuutil.so.1 -f usr/lib/libvarpd.so.1 0755 root bin f usr/lib/libvnd.so.1 0755 root bin s usr/lib/libvnd.so=libvnd.so.1 f usr/lib/libvolmgt.so.1 0755 root bin @@ -19719,7 +19719,7 @@ f usr/share/man/man7d/pm.7d 0444 root bin f usr/share/man/man7d/poll.7d 0444 root bin f usr/share/man/man7d/profile.7d 0444 root bin f usr/share/man/man7d/ptm.7d 0444 root bin -f usr/share/man/man7d/pts.7d 0444 root bin +s usr/share/man/man7d/pts.7d=ptm.7d f usr/share/man/man7d/pty.7d 0444 root bin f usr/share/man/man7d/qede.7d 0444 root bin f usr/share/man/man7d/qlc.7d 0444 root bin diff --git a/usr/src/lib/libdladm/common/libdladm.c b/usr/src/lib/libdladm/common/libdladm.c index b7c9824991..72c4457373 100644 --- a/usr/src/lib/libdladm/common/libdladm.c +++ b/usr/src/lib/libdladm/common/libdladm.c @@ -453,9 +453,6 @@ dladm_status2str(dladm_status_t status, char *buf) case DLADM_STATUS_INVALID_MTU: s = "MTU check failed, MTU outside of device's supported range"; break; - case DLADM_STATUS_BAD_ENCAP: - s = "invalid encapsulation protocol"; - break; case DLADM_STATUS_PERSIST_ON_TEMP: s = "can't create persistent object on top of temporary object"; break; |