diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-03 11:38:44 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-03 11:38:44 +0000 |
| commit | 1c5ac86169ba0e28b070d8b7f6c787be64bce7e4 (patch) | |
| tree | 984f229706437e50b866d25cd3aced33f9358a5f /usr/src/lib/libscf/inc/libscf.h | |
| parent | ed13e9ae4cee8abfe808486d0e0d7ee69b8fc256 (diff) | |
| parent | d15d17d4231f87f1571fa6d585377206f360f667 (diff) | |
| download | illumos-joyent-1c5ac86169ba0e28b070d8b7f6c787be64bce7e4.tar.gz | |
[illumos-gate merge]
commit d15d17d4231f87f1571fa6d585377206f360f667
12786 fix CTF pointer overrun
commit 8fff788790878e3c95666decd46960ecc74c1c69
12721 would like svcadm disable -c
commit 87be0d9605ee884229638b6fd168fa7165e109a3
12813 pptadm and libppt are x86 only
commit 069e6b7e31ba5dcbc5441b98af272714d9a5455c
12708 Packages could be linted
12717 Stop ignoring pkgdepend errors
commit 605d010da59abaf92279a7caed83515cbb3218dc
7510 enable highres clock usage for non-privileged users
Conflicts:
usr/src/man/man3c/timer_settime.3c
Diffstat (limited to 'usr/src/lib/libscf/inc/libscf.h')
| -rw-r--r-- | usr/src/lib/libscf/inc/libscf.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr/src/lib/libscf/inc/libscf.h b/usr/src/lib/libscf/inc/libscf.h index adc7455622..a30d374ae3 100644 --- a/usr/src/lib/libscf/inc/libscf.h +++ b/usr/src/lib/libscf/inc/libscf.h @@ -23,7 +23,7 @@ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright 2016 RackTop Systems. - * Copyright (c) 2012, Joyent, Inc. All rights reserved. + * Copyright 2020 Joyent, Inc. */ #ifndef _LIBSCF_H @@ -327,6 +327,7 @@ typedef struct { #define SCF_PROPERTY_AUX_STATE "auxiliary_state" #define SCF_PROPERTY_AUX_FMRI "auxiliary_fmri" #define SCF_PROPERTY_AUX_TTY "auxiliary_tty" +#define SCF_PROPERTY_COMMENT "comment" #define SCF_PROPERTY_CONTRACT "contract" #define SCF_PROPERTY_COREFILE_PATTERN "corefile_pattern" #define SCF_PROPERTY_DEGRADED "degraded" @@ -486,6 +487,9 @@ ssize_t scf_limit(uint32_t code); #define SCF_LIMIT_MAX_PG_TYPE_LENGTH -2002U #define SCF_LIMIT_MAX_FMRI_LENGTH -2003U + +#define SCF_COMMENT_MAX_LENGTH (1024) + scf_handle_t *scf_handle_create(scf_version_t); int scf_handle_decorate(scf_handle_t *, const char *, scf_value_t *); @@ -808,6 +812,7 @@ int scf_tmpl_error_value(const scf_tmpl_error_t *, char **); * Simplified calls */ int smf_enable_instance(const char *, int); +int smf_disable_instance_with_comment(const char *, int, const char *); int smf_disable_instance(const char *, int); int smf_refresh_instance(const char *); int smf_restart_instance(const char *); |