diff options
| author | Eric Schrock <Eric.Schrock@Sun.COM> | 2008-12-17 11:06:48 -0800 |
|---|---|---|
| committer | Eric Schrock <Eric.Schrock@Sun.COM> | 2008-12-17 11:06:48 -0800 |
| commit | c6fc6ddd482fa5c17788a38bd238258f2c22597c (patch) | |
| tree | 086f3fae999ee457a417c5b4bf0335e27ea04512 /usr/src/cmd/syseventadm | |
| parent | 6c7f40b3e72b5e6852c11af03745c0ace4d9984a (diff) | |
| download | illumos-joyent-c6fc6ddd482fa5c17788a38bd238258f2c22597c.tar.gz | |
6711375 sysevent runtime files should be under /var/run
Diffstat (limited to 'usr/src/cmd/syseventadm')
| -rw-r--r-- | usr/src/cmd/syseventadm/syseventadm.c | 13 | ||||
| -rw-r--r-- | usr/src/cmd/syseventadm/syseventadm.h | 11 |
2 files changed, 9 insertions, 15 deletions
diff --git a/usr/src/cmd/syseventadm/syseventadm.c b/usr/src/cmd/syseventadm/syseventadm.c index 5d17367ac1..1b23c8fa8c 100644 --- a/usr/src/cmd/syseventadm/syseventadm.c +++ b/usr/src/cmd/syseventadm/syseventadm.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * syseventadm - command to administer the sysevent.conf registry * - administers the general purpose event framework @@ -224,8 +221,8 @@ enter_lock(char *root_dir) { struct flock lock; - if (snprintf(lock_file, sizeof (lock_file), "%s%s/%s", root_dir, - SYSEVENT_CONFIG_DIR, LOCK_FILENAME) >= sizeof (lock_file)) { + if (snprintf(lock_file, sizeof (lock_file), "%s%s", root_dir, + LOCK_FILENAME) >= sizeof (lock_file)) { (void) fprintf(stderr, MSG_LOCK_PATH_ERR, whoami, lock_file); exit(EXIT_CMD_FAILED); } diff --git a/usr/src/cmd/syseventadm/syseventadm.h b/usr/src/cmd/syseventadm/syseventadm.h index 0fb39f9d70..e676655270 100644 --- a/usr/src/cmd/syseventadm/syseventadm.h +++ b/usr/src/cmd/syseventadm/syseventadm.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,15 +19,13 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #ifndef _SYSEVENTADM_H #define _SYSEVENTADM_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -41,7 +38,7 @@ extern "C" { /* * Lock file name to serialize registry updates */ -#define LOCK_FILENAME "sysevent.lock" +#define LOCK_FILENAME "/var/run/syseventconf.lock" /* * Required suffix for all sysevent.conf files |