7 files changed, 32 insertions, 27 deletions
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 094d620ee..3831ab44e 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -1,7 +1,8 @@
 /* vi: set sw=4 ts=4: */
-/* fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger */
-
-/* 5 July 2003 -- modified for Busybox by Erik Andersen
+/* fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger
+ * 5 July 2003 -- modified for Busybox by Erik Andersen
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 #include "libbb.h"
diff --git a/util-linux/fdisk_aix.c b/util-linux/fdisk_aix.c
index 83be8a8f9..2c0d2a6ac 100644
--- a/util-linux/fdisk_aix.c
+++ b/util-linux/fdisk_aix.c
@@ -1,8 +1,8 @@
 #if ENABLE_FEATURE_AIX_LABEL
 /*
  * Copyright (C) Andreas Neuper, Sep 1998.
- *      This file may be redistributed under
- *      the terms of the GNU Public License.
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 typedef struct {
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index c50ee9b16..ea5cd3c17 100644
--- a/util-linux/fdisk_osf.c
+++ b/util-linux/fdisk_osf.c
@@ -1,4 +1,3 @@
-#if ENABLE_FEATURE_OSF_LABEL
 /*
  * Copyright (c) 1987, 1988 Regents of the University of California.
  * All rights reserved.
@@ -32,6 +31,7 @@
  * SUCH DAMAGE.
  */
 
+#if ENABLE_FEATURE_OSF_LABEL
 
 #ifndef BSD_DISKMAGIC
 #define BSD_DISKMAGIC     ((uint32_t) 0x82564557)
diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c
index 5a86a6848..51cf30c98 100644
--- a/util-linux/fdisk_sgi.c
+++ b/util-linux/fdisk_sgi.c
@@ -1,13 +1,13 @@
-#if ENABLE_FEATURE_SGI_LABEL
-
-#define SGI_DEBUG 0
-
 /*
  * Copyright (C) Andreas Neuper, Sep 1998.
- *      This file may be modified and redistributed under
- *      the terms of the GNU Public License.
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
+#if ENABLE_FEATURE_SGI_LABEL
+
+#define SGI_DEBUG 0
+
 #define SGI_VOLHDR      0x00
 /* 1 and 2 were used for drive types no longer supported by SGI */
 #define SGI_SWAP        0x03
diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c
index d1a436b4a..9cdf869e9 100644
--- a/util-linux/fdisk_sun.c
+++ b/util-linux/fdisk_sun.c
@@ -1,3 +1,17 @@
+/*
+ * fdisk_sun.c
+ *
+ * I think this is mostly, or entirely, due to
+ *      Jakub Jelinek (jj@sunsite.mff.cuni.cz), July 1996
+ *
+ * Merged with fdisk for other architectures, aeb, June 1998.
+ *
+ * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ *      Internationalization
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ */
+
 #if ENABLE_FEATURE_SUN_LABEL
 
 #define SUNOS_SWAP 3
@@ -13,19 +27,6 @@
 
 #define SCSI_IOCTL_GET_IDLUN 0x5382
 
-/*
- * fdisksunlabel.c
- *
- * I think this is mostly, or entirely, due to
- *      Jakub Jelinek (jj@sunsite.mff.cuni.cz), July 1996
- *
- * Merged with fdisk for other architectures, aeb, June 1998.
- *
- * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *      Internationalization
- */
-
-
 static int sun_other_endian;
 static int scsi_disk;
 static int floppy;
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 3f7fb4bef..2666132f9 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -2,8 +2,9 @@
 /*
  * mkfs.c - make a linux (minix) file-system.
  *
- * (C) 1991 Linus Torvalds. This file may be redistributed as per
- * the Linux copyright.
+ * (C) 1991 Linus Torvalds.
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 /*
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index a9766caaa..6c399c746 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -3,6 +3,8 @@
  *
  * This version was taken from util-linux and scrubbed down for busybox.
  *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ *
  * This uses cross-platform Linux interfaces to enter a system sleep state,
  * and leave it no later than a specified time.  It uses any RTC framework
  * driver that supports standard driver model wakeup flags.