diff options
author | jhb <jhb@FreeBSD.org> | 2004-06-22 21:55:22 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2004-06-22 21:55:22 +0000 |
commit | 030ae438f9659e182b5d632c1d6fce9b34ee111b (patch) | |
tree | 2868f811ae731f16ab1691c884a60dd7d75cbc35 /sys/boot | |
parent | a2fca5d60c51c90368b7a589b9573891d3ffbfed (diff) | |
download | FreeBSD-src-030ae438f9659e182b5d632c1d6fce9b34ee111b.zip FreeBSD-src-030ae438f9659e182b5d632c1d6fce9b34ee111b.tar.gz |
Update the copyright to use a 3 clause BSD license rather than one that
is less clear about allowing redistribution of modified copies.
Requested by: Tom Cosgrove tom dot cosgrove at arches-consulting dot com
Diffstat (limited to 'sys/boot')
-rw-r--r-- | sys/boot/i386/cdboot/cdboot.s | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/sys/boot/i386/cdboot/cdboot.s b/sys/boot/i386/cdboot/cdboot.s index 51bdd4f..ab959f4 100644 --- a/sys/boot/i386/cdboot/cdboot.s +++ b/sys/boot/i386/cdboot/cdboot.s @@ -1,16 +1,30 @@ # -# Copyright (c) 2001 John Baldwin +# Copyright (c) 2001 John Baldwin <jhb@FreeBSD.org> # All rights reserved. # -# Redistribution and use in source and binary forms are freely -# permitted provided that the above copyright notice and this -# paragraph and the following disclaimer are duplicated in all -# such forms. -# -# This software is provided "AS IS" and without any express or -# implied warranties, including, without limitation, the implied -# warranties of merchantability and fitness for a particular -# purpose. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the author nor the names of any co-contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # # $FreeBSD$ |