diff options
| author | Tim Foster <tim.foster@joyent.com> | 2019-10-17 10:49:51 +0000 |
|---|---|---|
| committer | Tim Foster <tim.foster@joyent.com> | 2019-10-17 10:49:51 +0000 |
| commit | 4b3cef48f74b3f1985bb3e57c6d89967b2dcbe07 (patch) | |
| tree | 0e545b393122a41fe2716b21f89ba0b828ee4bc6 /usr/src | |
| parent | 30d94bf4d6986fcca3acbe4e6f2f0a7079a3e7c1 (diff) | |
| parent | 71a582fb9dbde6b71d4b60e1c43193f8a09624d3 (diff) | |
| download | illumos-joyent-4b3cef48f74b3f1985bb3e57c6d89967b2dcbe07.tar.gz | |
[illumos-gate merge]
commit 71a582fb9dbde6b71d4b60e1c43193f8a09624d3
11690 ::ps -s could show service FMRIs
commit d13dc62b448d915b4713212ba004dc4fb0accde4
11689 ::refstr would be useful
commit bc76be35ed72509d0c7f9ef22f0b4c57ea665703
11819 svcs -L should check for alt_logfile
Conflicts:
usr/src/cmd/mdb/common/modules/genunix/Makefile.files
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/svc/svcs/svcs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/cmd/svc/svcs/svcs.c b/usr/src/cmd/svc/svcs/svcs.c index 109b850b2d..b6998f2624 100644 --- a/usr/src/cmd/svc/svcs/svcs.c +++ b/usr/src/cmd/svc/svcs/svcs.c @@ -2651,9 +2651,8 @@ restarter_common: return (0); } -/* ARGSUSED */ static int -print_log(void *unused, scf_walkinfo_t *wip) +print_log(void *unused __unused, scf_walkinfo_t *wip) { scf_propertygroup_t *rpg; char buf[MAXPATHLEN]; @@ -2671,6 +2670,9 @@ print_log(void *unused, scf_walkinfo_t *wip) if (pg_get_single_val(rpg, SCF_PROPERTY_LOGFILE, SCF_TYPE_ASTRING, buf, sizeof (buf), 0) == 0) { (void) printf("%s\n", buf); + } else if (pg_get_single_val(rpg, SCF_PROPERTY_ALT_LOGFILE, + SCF_TYPE_ASTRING, buf, sizeof (buf), 0) == 0) { + (void) printf("%s\n", buf); } out: |