Skip to content

Commit 492b1d2

Browse files
dunbehlendorf
authored andcommitted
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 <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#3384
1 parent 214806c commit 492b1d2

File tree

16 files changed

+141
-322
lines changed

16 files changed

+141
-322
lines changed

COPYRIGHT

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ Unless otherwise noted, all files in this distribution are released
2929
under the Common Development and Distribution License (CDDL).
3030
Exceptions are noted within the associated source files. See the file
3131
OPENSOLARIS.LICENSE for more information.
32+
33+
Refer to the git commit log for authoritative copyright attribution.

cmd/zed/zed.c

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
/*
2-
* CDDL HEADER START
3-
*
4-
* The contents of this file are subject to the terms of the
5-
* Common Development and Distribution License (the "License").
6-
* You may not use this file except in compliance with the License.
7-
*
8-
* You can obtain a copy of the license from the top-level
9-
* OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
10-
* See the License for the specific language governing permissions
11-
* and limitations under the License.
12-
*
13-
* When distributing Covered Code, include this CDDL HEADER in each file
14-
* and include the License file from the top-level OPENSOLARIS.LICENSE.
15-
* If applicable, add the following below this CDDL HEADER, with the
16-
* fields enclosed by brackets "[]" replaced with your own identifying
17-
* information: Portions Copyright [yyyy] [name of copyright owner]
18-
*
19-
* CDDL HEADER END
20-
*/
21-
22-
/*
2+
* This file is part of the ZFS Event Daemon (ZED)
3+
* for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
234
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
245
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
6+
* Refer to the ZoL git commit log for authoritative copyright attribution.
7+
*
8+
* The contents of this file are subject to the terms of the
9+
* Common Development and Distribution License Version 1.0 (CDDL-1.0).
10+
* You can obtain a copy of the license from the top-level file
11+
* "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
12+
* You may not use this file except in compliance with the license.
2513
*/
2614

2715
#include <errno.h>

cmd/zed/zed.h

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
/*
2-
* CDDL HEADER START
3-
*
4-
* The contents of this file are subject to the terms of the
5-
* Common Development and Distribution License (the "License").
6-
* You may not use this file except in compliance with the License.
7-
*
8-
* You can obtain a copy of the license from the top-level
9-
* OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
10-
* See the License for the specific language governing permissions
11-
* and limitations under the License.
12-
*
13-
* When distributing Covered Code, include this CDDL HEADER in each file
14-
* and include the License file from the top-level OPENSOLARIS.LICENSE.
15-
* If applicable, add the following below this CDDL HEADER, with the
16-
* fields enclosed by brackets "[]" replaced with your own identifying
17-
* information: Portions Copyright [yyyy] [name of copyright owner]
18-
*
19-
* CDDL HEADER END
20-
*/
21-
22-
/*
2+
* This file is part of the ZFS Event Daemon (ZED)
3+
* for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
234
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
245
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
6+
* Refer to the ZoL git commit log for authoritative copyright attribution.
7+
*
8+
* The contents of this file are subject to the terms of the
9+
* Common Development and Distribution License Version 1.0 (CDDL-1.0).
10+
* You can obtain a copy of the license from the top-level file
11+
* "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
12+
* You may not use this file except in compliance with the license.
2513
*/
2614

2715
#ifndef ZED_H

cmd/zed/zed_conf.c

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
/*
2-
* CDDL HEADER START
3-
*
4-
* The contents of this file are subject to the terms of the
5-
* Common Development and Distribution License (the "License").
6-
* You may not use this file except in compliance with the License.
7-
*
8-
* You can obtain a copy of the license from the top-level
9-
* OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
10-
* See the License for the specific language governing permissions
11-
* and limitations under the License.
12-
*
13-
* When distributing Covered Code, include this CDDL HEADER in each file
14-
* and include the License file from the top-level OPENSOLARIS.LICENSE.
15-
* If applicable, add the following below this CDDL HEADER, with the
16-
* fields enclosed by brackets "[]" replaced with your own identifying
17-
* information: Portions Copyright [yyyy] [name of copyright owner]
18-
*
19-
* CDDL HEADER END
20-
*/
21-
22-
/*
2+
* This file is part of the ZFS Event Daemon (ZED)
3+
* for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
234
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
245
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
6+
* Refer to the ZoL git commit log for authoritative copyright attribution.
7+
*
8+
* The contents of this file are subject to the terms of the
9+
* Common Development and Distribution License Version 1.0 (CDDL-1.0).
10+
* You can obtain a copy of the license from the top-level file
11+
* "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
12+
* You may not use this file except in compliance with the license.
2513
*/
2614

2715
#include <assert.h>
@@ -196,10 +184,9 @@ _zed_conf_display_license(void)
196184
"The ZFS Event Daemon (ZED) is distributed under the terms of the",
197185
" Common Development and Distribution License (CDDL-1.0)",
198186
" <http://opensource.org/licenses/CDDL-1.0>.",
187+
"",
199188
"Developed at Lawrence Livermore National Laboratory"
200189
" (LLNL-CODE-403049).",
201-
"Copyright (C) 2013-2014"
202-
" Lawrence Livermore National Security, LLC.",
203190
"",
204191
NULL
205192
};

cmd/zed/zed_conf.h

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
/*
2-
* CDDL HEADER START
3-
*
4-
* The contents of this file are subject to the terms of the
5-
* Common Development and Distribution License (the "License").
6-
* You may not use this file except in compliance with the License.
7-
*
8-
* You can obtain a copy of the license from the top-level
9-
* OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
10-
* See the License for the specific language governing permissions
11-
* and limitations under the License.
12-
*
13-
* When distributing Covered Code, include this CDDL HEADER in each file
14-
* and include the License file from the top-level OPENSOLARIS.LICENSE.
15-
* If applicable, add the following below this CDDL HEADER, with the
16-
* fields enclosed by brackets "[]" replaced with your own identifying
17-
* information: Portions Copyright [yyyy] [name of copyright owner]
18-
*
19-
* CDDL HEADER END
20-
*/
21-
22-
/*
2+
* This file is part of the ZFS Event Daemon (ZED)
3+
* for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
234
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
245
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
6+
* Refer to the ZoL git commit log for authoritative copyright attribution.
7+
*
8+
* The contents of this file are subject to the terms of the
9+
* Common Development and Distribution License Version 1.0 (CDDL-1.0).
10+
* You can obtain a copy of the license from the top-level file
11+
* "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
12+
* You may not use this file except in compliance with the license.
2513
*/
2614

2715
#ifndef ZED_CONF_H

cmd/zed/zed_event.c

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
/*
2-
* CDDL HEADER START
3-
*
4-
* The contents of this file are subject to the terms of the
5-
* Common Development and Distribution License (the "License").
6-
* You may not use this file except in compliance with the License.
7-
*
8-
* You can obtain a copy of the license from the top-level
9-
* OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
10-
* See the License for the specific language governing permissions
11-
* and limitations under the License.
12-
*
13-
* When distributing Covered Code, include this CDDL HEADER in each file
14-
* and include the License file from the top-level OPENSOLARIS.LICENSE.
15-
* If applicable, add the following below this CDDL HEADER, with the
16-
* fields enclosed by brackets "[]" replaced with your own identifying
17-
* information: Portions Copyright [yyyy] [name of copyright owner]
18-
*
19-
* CDDL HEADER END
20-
*/
21-
22-
/*
2+
* This file is part of the ZFS Event Daemon (ZED)
3+
* for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
234
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
245
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
6+
* Refer to the ZoL git commit log for authoritative copyright attribution.
7+
*
8+
* The contents of this file are subject to the terms of the
9+
* Common Development and Distribution License Version 1.0 (CDDL-1.0).
10+
* You can obtain a copy of the license from the top-level file
11+
* "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
12+
* You may not use this file except in compliance with the license.
2513
*/
2614

2715
#include <ctype.h>

cmd/zed/zed_event.h

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
/*
2-
* CDDL HEADER START
3-
*
4-
* The contents of this file are subject to the terms of the
5-
* Common Development and Distribution License (the "License").
6-
* You may not use this file except in compliance with the License.
7-
*
8-
* You can obtain a copy of the license from the top-level
9-
* OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
10-
* See the License for the specific language governing permissions
11-
* and limitations under the License.
12-
*
13-
* When distributing Covered Code, include this CDDL HEADER in each file
14-
* and include the License file from the top-level OPENSOLARIS.LICENSE.
15-
* If applicable, add the following below this CDDL HEADER, with the
16-
* fields enclosed by brackets "[]" replaced with your own identifying
17-
* information: Portions Copyright [yyyy] [name of copyright owner]
18-
*
19-
* CDDL HEADER END
20-
*/
21-
22-
/*
2+
* This file is part of the ZFS Event Daemon (ZED)
3+
* for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
234
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
245
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
6+
* Refer to the ZoL git commit log for authoritative copyright attribution.
7+
*
8+
* The contents of this file are subject to the terms of the
9+
* Common Development and Distribution License Version 1.0 (CDDL-1.0).
10+
* You can obtain a copy of the license from the top-level file
11+
* "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
12+
* You may not use this file except in compliance with the license.
2513
*/
2614

2715
#ifndef ZED_EVENT_H

cmd/zed/zed_exec.c

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
/*
2-
* CDDL HEADER START
3-
*
4-
* The contents of this file are subject to the terms of the
5-
* Common Development and Distribution License (the "License").
6-
* You may not use this file except in compliance with the License.
7-
*
8-
* You can obtain a copy of the license from the top-level
9-
* OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
10-
* See the License for the specific language governing permissions
11-
* and limitations under the License.
12-
*
13-
* When distributing Covered Code, include this CDDL HEADER in each file
14-
* and include the License file from the top-level OPENSOLARIS.LICENSE.
15-
* If applicable, add the following below this CDDL HEADER, with the
16-
* fields enclosed by brackets "[]" replaced with your own identifying
17-
* information: Portions Copyright [yyyy] [name of copyright owner]
18-
*
19-
* CDDL HEADER END
20-
*/
21-
22-
/*
2+
* This file is part of the ZFS Event Daemon (ZED)
3+
* for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
234
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
245
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
6+
* Refer to the ZoL git commit log for authoritative copyright attribution.
7+
*
8+
* The contents of this file are subject to the terms of the
9+
* Common Development and Distribution License Version 1.0 (CDDL-1.0).
10+
* You can obtain a copy of the license from the top-level file
11+
* "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
12+
* You may not use this file except in compliance with the license.
2513
*/
2614

2715
#include <assert.h>

cmd/zed/zed_exec.h

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
/*
2-
* CDDL HEADER START
3-
*
4-
* The contents of this file are subject to the terms of the
5-
* Common Development and Distribution License (the "License").
6-
* You may not use this file except in compliance with the License.
7-
*
8-
* You can obtain a copy of the license from the top-level
9-
* OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
10-
* See the License for the specific language governing permissions
11-
* and limitations under the License.
12-
*
13-
* When distributing Covered Code, include this CDDL HEADER in each file
14-
* and include the License file from the top-level OPENSOLARIS.LICENSE.
15-
* If applicable, add the following below this CDDL HEADER, with the
16-
* fields enclosed by brackets "[]" replaced with your own identifying
17-
* information: Portions Copyright [yyyy] [name of copyright owner]
18-
*
19-
* CDDL HEADER END
20-
*/
21-
22-
/*
2+
* This file is part of the ZFS Event Daemon (ZED)
3+
* for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
234
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
245
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
6+
* Refer to the ZoL git commit log for authoritative copyright attribution.
7+
*
8+
* The contents of this file are subject to the terms of the
9+
* Common Development and Distribution License Version 1.0 (CDDL-1.0).
10+
* You can obtain a copy of the license from the top-level file
11+
* "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
12+
* You may not use this file except in compliance with the license.
2513
*/
2614

2715
#ifndef ZED_EXEC_H

cmd/zed/zed_file.c

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
/*
2-
* CDDL HEADER START
3-
*
4-
* The contents of this file are subject to the terms of the
5-
* Common Development and Distribution License (the "License").
6-
* You may not use this file except in compliance with the License.
7-
*
8-
* You can obtain a copy of the license from the top-level
9-
* OPENSOLARIS.LICENSE or <http://opensource.org/licenses/CDDL-1.0>.
10-
* See the License for the specific language governing permissions
11-
* and limitations under the License.
12-
*
13-
* When distributing Covered Code, include this CDDL HEADER in each file
14-
* and include the License file from the top-level OPENSOLARIS.LICENSE.
15-
* If applicable, add the following below this CDDL HEADER, with the
16-
* fields enclosed by brackets "[]" replaced with your own identifying
17-
* information: Portions Copyright [yyyy] [name of copyright owner]
18-
*
19-
* CDDL HEADER END
20-
*/
21-
22-
/*
2+
* This file is part of the ZFS Event Daemon (ZED)
3+
* for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
234
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
245
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
6+
* Refer to the ZoL git commit log for authoritative copyright attribution.
7+
*
8+
* The contents of this file are subject to the terms of the
9+
* Common Development and Distribution License Version 1.0 (CDDL-1.0).
10+
* You can obtain a copy of the license from the top-level file
11+
* "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
12+
* You may not use this file except in compliance with the license.
2513
*/
2614

2715
#include <errno.h>

0 commit comments

Comments
 (0)