diff options
Diffstat (limited to 'usr/src/cmd/svc/svcs/explain.c')
| -rw-r--r-- | usr/src/cmd/svc/svcs/explain.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/usr/src/cmd/svc/svcs/explain.c b/usr/src/cmd/svc/svcs/explain.c index 42fca80172..41ba1b3b47 100644 --- a/usr/src/cmd/svc/svcs/explain.c +++ b/usr/src/cmd/svc/svcs/explain.c @@ -22,7 +22,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright (c) 2011, Joyent, Inc. All rights reserved. + * Copyright (c) 2015, Joyent, Inc. All rights reserved. */ /* @@ -112,15 +112,9 @@ #define uu_list_append(lst, e) uu_list_insert_before(lst, NULL, e) -#ifdef NDEBUG -#define bad_error(func, err) abort() -#else #define bad_error(func, err) \ - (void) fprintf(stderr, "%s:%d: %s() failed with unknown error %d.\n", \ - __FILE__, __LINE__, func, err); \ - abort(); -#endif - + uu_panic("%s:%d: %s() failed with unknown error %d.\n", \ + __FILE__, __LINE__, func, err); typedef struct { const char *svcname; @@ -200,6 +194,7 @@ static char *emsg_invalid_dep; extern scf_handle_t *h; extern char *g_zonename; +extern char *g_zonealias; /* ARGSUSED */ static int @@ -2000,6 +1995,9 @@ print_service(inst_t *svcp, int verbose) if (g_zonename != NULL) (void) printf(gettext(" Zone: %s\n"), g_zonename); + if (g_zonealias != NULL) + (void) printf(gettext(" Alias: %s\n"), g_zonealias); + stime = svcp->stime.tv_sec; tmp = localtime(&stime); |