diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2020-05-28 11:07:27 +0000 |
|---|---|---|
| committer | Andy Fiddaman <omnios@citrus-it.co.uk> | 2020-06-01 09:44:44 +0000 |
| commit | 9f84ea46383c55ba04c274011946d91804aba95f (patch) | |
| tree | bbad74886fcfad6fe6c13ab7c8bf421f7ec73542 | |
| parent | 2a93e0bc6b60286283274376cae765bed0c59594 (diff) | |
| download | illumos-joyent-9f84ea46383c55ba04c274011946d91804aba95f.tar.gz | |
12800 smf methods using wrong exit code tokens
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Rich Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.sbin/routeadm/svc-forwarding | 4 | ||||
| -rw-r--r-- | usr/src/cmd/vntsd/svc-vntsd | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/svc-forwarding b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/svc-forwarding index 48f77f98e1..b0c94b9acd 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/svc-forwarding +++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/svc-forwarding @@ -40,7 +40,7 @@ proto="$2" if [ -z "$proto" ]; then usage - exit $SMF_ERROR_FATAL + exit $SMF_EXIT_ERROR_FATAL fi case "$1" in @@ -65,7 +65,7 @@ case "$1" in ;; *) usage - exit $SMF_ERROR_FATAL + exit $SMF_EXIT_ERROR_FATAL ;; esac diff --git a/usr/src/cmd/vntsd/svc-vntsd b/usr/src/cmd/vntsd/svc-vntsd index 988fa2d6c3..3bea6c0274 100644 --- a/usr/src/cmd/vntsd/svc-vntsd +++ b/usr/src/cmd/vntsd/svc-vntsd @@ -87,9 +87,9 @@ add_user_entries() w q EOF - else + else # - # Add a root entry with vntsd attribute. + # Add a root entry with vntsd attribute. # $CAT >>${USER_ATTR} << EOF # Added by svc-vntsd @@ -155,9 +155,9 @@ if [ -x /usr/lib/ldoms/vntsd ]; then # if vntsd exited in error with status 1, let SMF restart it # otherwise we want it to go into maintenance. if [ $rc -eq 1 ]; then - exit $SMF_ERR_OTHER + exit $rc else - exit $SMF_ERR_FATAL + exit $SMF_EXIT_ERR_FATAL fi fi else |