diff options
| author | Robert Mustacchi <rm@joyent.com> | 2015-06-04 08:15:37 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2015-06-09 14:53:54 -0700 |
| commit | a6490d0f4f068b0e0b17b98d03e50301aa6bb3f4 (patch) | |
| tree | 79fc39728b3c4b2e8fbb0e6834976bb40df823c9 /usr/src/cmd/svc | |
| parent | 90553fa8afd7a98e67bf29073ba4c8d157bb00c9 (diff) | |
| download | illumos-gate-a6490d0f4f068b0e0b17b98d03e50301aa6bb3f4.tar.gz | |
5983 5896 fallout when EMI is removed
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/cmd/svc')
| -rw-r--r-- | usr/src/cmd/svc/svccfg/svccfg_libscf.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr/src/cmd/svc/svccfg/svccfg_libscf.c b/usr/src/cmd/svc/svccfg/svccfg_libscf.c index b504bc8377..3866bc4bd0 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c +++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c @@ -21,7 +21,7 @@ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, Joyent, Inc. All rights reserved. + * Copyright 2015 Joyent, Inc. * Copyright 2012 Milan Jurik. All rights reserved. */ @@ -6795,10 +6795,14 @@ lscf_instance_verify(scf_scope_t *scope, entity_t *svc, entity_t *inst) /* * smf_get_state does not distinguish between its different failure - * modes: memory allocation failures and SMF internal failures. + * modes: memory allocation failures, SMF internal failures, and a lack + * of EMI entirely because it's been removed. In these cases, we're + * going to be conservative and opt to say that if we don't know, better + * to not block import or falsely warn to the user. */ - if ((emi_state = smf_get_state(SCF_INSTANCE_EMI)) == NULL) - return (EAGAIN); + if ((emi_state = smf_get_state(SCF_INSTANCE_EMI)) == NULL) { + return (0); + } /* * As per the block comment for this function check the state of EMI |