systemd encryption key support

[zfs] / cmd / zed / zed_conf.h

diff --git a/cmd/zed/zed_conf.h b/cmd/zed/zed_conf.h
index 51b98ea7693a90cd2657ed23ca1d5a5afb602d6c..7d6b63b1d7cd098488638c23dd3b119445eb55c1 100644 (file)
--- a/cmd/zed/zed_conf.h
+++ b/cmd/zed/zed_conf.h
@@ -1,27 +1,15 @@
 /*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * 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 from the top-level
- * OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each file
- * and include the License file from the top-level OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
+ * This file is part of the ZFS Event Daemon (ZED)
+ * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
  * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
  * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
+ * Refer to the ZoL git commit log for authoritative copyright attribution.
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License Version 1.0 (CDDL-1.0).
+ * You can obtain a copy of the license from the top-level file
+ * "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
+ * You may not use this file except in compliance with the license.
  */
 
 #ifndef        ZED_CONF_H
@@ -42,12 +30,14 @@ struct zed_conf {
        int             max_events;             /* RESERVED FOR FUTURE USE */
        char            *conf_file;             /* abs path to config file */
        char            *pid_file;              /* abs path to pid file */
-       char            *script_dir;            /* abs path to script dir */
-       zed_strings_t   *scripts;               /* names of enabled scripts */
+       int             pid_fd;                 /* fd to pid file for lock */
+       char            *zedlet_dir;            /* abs path to zedlet dir */
+       zed_strings_t   *zedlets;               /* names of enabled zedlets */
        char            *state_file;            /* abs path to state file */
        int             state_fd;               /* fd to state file */
        libzfs_handle_t *zfs_hdl;               /* handle to libzfs */
        int             zevent_fd;              /* fd for access to zevents */
+       char            *path;          /* custom $PATH for zedlets to use */
 };
 
 struct zed_conf *zed_conf_create(void);