diff options
| author | Robert Mustacchi <rm@joyent.com> | 2015-03-20 00:37:56 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2015-03-23 17:52:27 +0000 |
| commit | 6e09664c777b4c9bb52577dfab3a1552c2b6b72e (patch) | |
| tree | 1c797a01ba391b423500aadb50ef37d635562f58 /usr/src | |
| parent | 8b2aaf67ea7c8fb3065a72da1ed45458a2009d52 (diff) | |
| download | illumos-joyent-6e09664c777b4c9bb52577dfab3a1552c2b6b72e.tar.gz | |
OS-4077 varpd should live in /usr/lib
OS-4079 zero out the fma message on restore to help with mdb confusion
OS-4087 dladm show-overlay -f doesn't properly show degraded state
Reviewed by: Joshua M. Clulow <jmc@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/dladm/dladm.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/varpd/Makefile | 10 | ||||
| -rw-r--r-- | usr/src/cmd/varpd/svc-varpd | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/io/overlay/overlay_fm.c | 1 |
4 files changed, 13 insertions, 4 deletions
diff --git a/usr/src/cmd/dladm/dladm.c b/usr/src/cmd/dladm/dladm.c index ae576819ec..9cfd1eab9f 100644 --- a/usr/src/cmd/dladm/dladm.c +++ b/usr/src/cmd/dladm/dladm.c @@ -10321,8 +10321,8 @@ show_one_overlay_fma_cb(dladm_handle_t handle, datalink_id_t linkid, dladm_overlay_status_t *stat, void *arg) { showoverlay_fma_state_t *shof = arg; - - ofmt_print(shof->shof_ofmt, arg); + shof->shof_status = stat; + ofmt_print(shof->shof_ofmt, shof); } diff --git a/usr/src/cmd/varpd/Makefile b/usr/src/cmd/varpd/Makefile index d5415d2c25..cff0f49f9d 100644 --- a/usr/src/cmd/varpd/Makefile +++ b/usr/src/cmd/varpd/Makefile @@ -18,6 +18,8 @@ OBJS = varpd.o SRCS = $(OBJS:%.o=../%.c) SVCMETHOD = svc-varpd MANIFEST = varpd.xml +ROOTLIBVARPD = $(ROOTLIB)/varpd +ROOTLIBVARPDPROG= $(PROG:%=$(ROOTLIBVARPD)/%) include ../Makefile.cmd @@ -59,7 +61,13 @@ check: $(CHKMANIFEST) clobber: clean $(RM) $(PROG) -install: $(PROG) $(ROOTUSRSBINPROG) $(ROOTMANIFEST) $(ROOTSVCMETHOD) +install: $(PROG) $(ROOTLIBVARPDPROG) $(ROOTMANIFEST) $(ROOTSVCMETHOD) + +$(ROOTLIBVARPD): + $(INS.dir) + +$(ROOTLIBVARPD)/%: % $(ROOTLIBVARPD) + $(INS.file) FRC: diff --git a/usr/src/cmd/varpd/svc-varpd b/usr/src/cmd/varpd/svc-varpd index d3cf1ffac5..ace611c8de 100644 --- a/usr/src/cmd/varpd/svc-varpd +++ b/usr/src/cmd/varpd/svc-varpd @@ -27,7 +27,7 @@ add_drv overlay 2>/dev/null # # This should be a service property. # -/usr/sbin/varpd -i /usr/lib/varpd +/usr/lib/varpd/varpd -i /usr/lib/varpd if [ $? = 0 ]; then exit $SMF_EXIT_OK else diff --git a/usr/src/uts/common/io/overlay/overlay_fm.c b/usr/src/uts/common/io/overlay/overlay_fm.c index f3a83d882b..f26356ceaf 100644 --- a/usr/src/uts/common/io/overlay/overlay_fm.c +++ b/usr/src/uts/common/io/overlay/overlay_fm.c @@ -71,6 +71,7 @@ overlay_fm_restore(overlay_dev_t *odd) if (!(odd->odd_flags & OVERLAY_F_DEGRADED)) goto out; + odd->odd_fmamsg[0] = '\0'; odd->odd_flags &= ~OVERLAY_F_DEGRADED; overlay_fm_count--; if (overlay_fm_count == 0) { |