From e9a7a6212b5881bd29ee5936b492f4d8899df8bb Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Fri, 22 Sep 2006 02:52:41 +0000
Subject: Change license statements (and clean up headers) on some of the files
 that Erik or I are primary copyright holders on.

---
 util-linux/dmesg.c       | 2 +-
 util-linux/freeramdisk.c | 2 +-
 util-linux/mdev.c        | 2 +-
 util-linux/mkswap.c      | 2 +-
 util-linux/pivot_root.c  | 5 +----
 util-linux/swaponoff.c   | 5 +----
 util-linux/switch_root.c | 5 +----
 util-linux/umount.c      | 5 +----
 8 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'util-linux')

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index c8b3aeeab..682c4f696 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -6,7 +6,7 @@
  * Copyright 2006 Rob Landley <rob@landley.net>
  * Copyright 2006 Bernhard Fischer <rep.nop@aon.at>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 9e1c453e4..5d110bc4b 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -6,7 +6,7 @@
  * Adjusted a bit by Erik Andersen <andersen@codepoet.org>
  * Unified with fdflush by Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index da4930f27..acc5012d4 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -6,7 +6,7 @@
  * Copyright 2005 Rob Landley <rob@landley.net>
  * Copyright 2005 Frank Sorenson <frank@tuxrocks.com>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 8c307ec43..2dee5ac18 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2006 Rob Landley <rob@landley.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 #include <busybox.h>
diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index 39a257a19..bd02302c7 100644
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -6,11 +6,8 @@
  * pivot_root syscall stubbed by Erik Andersen, so it will compile
  *     regardless of the kernel being used.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
 #include "busybox.h"
 
 extern int pivot_root(const char * new_root,const char * put_old);
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index e75ca7ece..ab754848e 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -4,14 +4,11 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
 #include "busybox.h"
 #include <mntent.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
 #include <sys/swap.h>
 
 
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 411b738f0..1a599073e 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -3,14 +3,11 @@
  *
  * Switch from rootfs to another filesystem as the root of the mount tree.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"
-#include <fcntl.h>
-#include <string.h>
 #include <sys/vfs.h>
-#include <unistd.h>
 
 
 // Make up for header deficiencies.
diff --git a/util-linux/umount.c b/util-linux/umount.c
index f19586a0d..e4308e547 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -5,10 +5,7 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Copyright (C) 2005 by Rob Landley <rob@landley.net>
  *
- * This program is licensed under the GNU General Public license (GPL)
- * version 2 or later, see http://www.fsf.org/licensing/licenses/gpl.html
- * or the file "LICENSE" in the busybox source tarball for the full text.
- *
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
 #include "busybox.h"
-- 
cgit v1.2.3