diff options
Diffstat (limited to 'usr/src/cmd/svc/svcadm')
| -rw-r--r-- | usr/src/cmd/svc/svcadm/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/cmd/svc/svcadm/svcadm.c | 15 |
2 files changed, 10 insertions, 12 deletions
diff --git a/usr/src/cmd/svc/svcadm/Makefile b/usr/src/cmd/svc/svcadm/Makefile index cc0cc160bf..1a6a0dd35c 100644 --- a/usr/src/cmd/svc/svcadm/Makefile +++ b/usr/src/cmd/svc/svcadm/Makefile @@ -21,6 +21,7 @@ # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2012, Joyent, Inc. All rights reserved. # PROG = svcadm @@ -49,7 +50,11 @@ $(PROG): $(OBJS) $(POFILE): $(POFILES) cat $(POFILES) > $(POFILE) -install: all $(ROOTUSRSBINPROG) +install: all $(ROOTSBINPROG) $(ROOTUSRSBINPROG) + +$(ROOTUSRSBINPROG): + -$(RM) $@ + -$(SYMLINK) ../../sbin/$(PROG) $@ clean: $(RM) $(OBJS) diff --git a/usr/src/cmd/svc/svcadm/svcadm.c b/usr/src/cmd/svc/svcadm/svcadm.c index 7cd61454c9..ac698930d4 100644 --- a/usr/src/cmd/svc/svcadm/svcadm.c +++ b/usr/src/cmd/svc/svcadm/svcadm.c @@ -24,7 +24,7 @@ */ /* - * Copyright 2013, Joyent, Inc. All rights reserved. + * Copyright 2015, Joyent, Inc. All rights reserved. */ /* @@ -71,16 +71,9 @@ */ #define WAIT_INTERVAL 3 -#ifndef NDEBUG -#define bad_error(func, err) { \ - pr_warn("%s:%d: %s() failed with unexpected error %d.\n", \ - __FILE__, __LINE__, (func), (err)); \ - abort(); \ -} -#else -#define bad_error(func, err) abort() -#endif - +#define bad_error(func, err) \ + uu_panic("%s:%d: %s() failed with unexpected error %d.\n", \ + __FILE__, __LINE__, (func), (err)); struct ht_elt { struct ht_elt *next; |