From 492b1d2ef0aa14c22a8f075d948950d072970c17 Mon Sep 17 00:00:00 2001 From: Chris Dunlap Date: Wed, 6 May 2015 15:56:03 -0700 Subject: Update ZED copyright boilerplate This commit updates the copyright boilerplate within the ZED subtree. The instructions for appending a contributor copyright line have been removed. Manually maintaining copyright notices in this manner is error-prone, imprecise at a file-scope granularity, and oftentimes inaccurate. These lines can become a pernicious source of merge conflicts. A commit log is better suited to maintaining this information. Consequently, a line has been added to the boilerplate to refer to the git commit log for authoritative copyright attribution. To account for the scenario where a file may become separated from the codebase and commit history (i.e., it is copied somewhere else), a line has been added to identify the file's origin. http://softwarefreedom.org/resources/2012/ManagingCopyrightInformation.html Signed-off-by: Chris Dunlap Signed-off-by: Brian Behlendorf Closes #3384 --- cmd/zed/zed_conf.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) (limited to 'cmd/zed/zed_conf.c') diff --git a/cmd/zed/zed_conf.c b/cmd/zed/zed_conf.c index 61529bd8f..6dfd14e56 100644 --- a/cmd/zed/zed_conf.c +++ b/cmd/zed/zed_conf.c @@ -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 . - * 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) . * 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 . + * You may not use this file except in compliance with the license. */ #include @@ -196,10 +184,9 @@ _zed_conf_display_license(void) "The ZFS Event Daemon (ZED) is distributed under the terms of the", " Common Development and Distribution License (CDDL-1.0)", " .", + "", "Developed at Lawrence Livermore National Laboratory" " (LLNL-CODE-403049).", - "Copyright (C) 2013-2014" - " Lawrence Livermore National Security, LLC.", "", NULL }; -- cgit v1.2.3