svn commit: r261517 - head/sys/boot/i386/pxeldr

John Baldwin jhb at FreeBSD.org
Wed Feb 5 17:22:55 UTC 2014


Author: jhb
Date: Wed Feb  5 17:22:54 2014
New Revision: 261517
URL: http://svnweb.freebsd.org/changeset/base/261517

Log:
  Similar to r130943 for cdboot.S, update the license on this file to a
  stock 2-clause BSD license.
  
  MFC after:	1 week

Modified:
  head/sys/boot/i386/pxeldr/pxeldr.S

Modified: head/sys/boot/i386/pxeldr/pxeldr.S
==============================================================================
--- head/sys/boot/i386/pxeldr/pxeldr.S	Wed Feb  5 17:08:55 2014	(r261516)
+++ head/sys/boot/i386/pxeldr/pxeldr.S	Wed Feb  5 17:22:54 2014	(r261517)
@@ -2,15 +2,26 @@
  * Copyright (c) 2000 John Baldwin
  * 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.
+ * 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.
  *
- * 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.
+ * 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$
  */


More information about the svn-src-head mailing list