diff options
| author | Bryan Cantrill <bryan@joyent.com> | 2011-03-10 22:20:47 -0800 |
|---|---|---|
| committer | Bryan Cantrill <bryan@joyent.com> | 2011-03-10 22:20:47 -0800 |
| commit | d64449f33428b27354181d373ebace687a65825a (patch) | |
| tree | 72c33bca575fd7bf432665047bd193cd0cdaff6c /usr/src | |
| parent | 91b399ae92ee5a566f507e6bae2fe499a3977d5a (diff) | |
| download | illumos-joyent-d64449f33428b27354181d373ebace687a65825a.tar.gz | |
OS-297 "svcs -z" returns success when the zone is not running
OS-310 svcs -L should not need an argument
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/svc/svcs/svcs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/cmd/svc/svcs/svcs.c b/usr/src/cmd/svc/svcs/svcs.c index dbcecda706..8fad49ab37 100644 --- a/usr/src/cmd/svc/svcs/svcs.c +++ b/usr/src/cmd/svc/svcs/svcs.c @@ -3683,6 +3683,10 @@ again: uu_warn(gettext("Could not bind to repository " "server for zone %s: %s\n"), g_zonename, scf_strerror(scf_error())); + + if (!show_zones) + return (UU_EXIT_FATAL); + goto nextzone; } @@ -3741,9 +3745,6 @@ again: } if (opt_mode == 'L') { - if (argc == 0) - argserr(progname); - if ((err = scf_walk_fmri(h, argc, argv, SCF_WALK_MULTIPLE, print_log, NULL, errarg, errfunc)) != 0) { uu_warn(gettext("failed to iterate over " |