7 files changed, 7 insertions, 13 deletions

diff --git a/util-linux/Config.src b/util-linux/Config.src
index 68fcc266f..0fad3e5c0 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Linux System Utilities"
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 7275535e6..cdcba0a03 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -2004,12 +2004,6 @@ check_consistency(const struct partition *p, int partition)
                 printf("     phys=(%u,%u,%u) ", pec, peh, pes);
                 printf("logical=(%u,%u,%u)\n", lec, leh, les);
         }
-
-/* Ending on cylinder boundary? */
-        if (peh != (g_heads - 1) || pes != g_sectors) {
-                printf("Partition %u does not end on cylinder boundary\n",
-                        partition + 1);
-        }
 }
 
 static void
diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c
index 30def09c6..1cf0af5cc 100644
--- a/util-linux/fdisk_sgi.c
+++ b/util-linux/fdisk_sgi.c
@@ -425,7 +425,7 @@ create_sgiinfo(void)
         /* I keep SGI's habit to write the sgilabel to the second block */
         sgilabel->directory[0].vol_file_start = SGI_SSWAP32(2);
         sgilabel->directory[0].vol_file_size = SGI_SSWAP32(sizeof(sgiinfo));
-        strncpy((char*)sgilabel->directory[0].vol_file_name, "sgilabel", 8);
+        memcpy((char*)sgilabel->directory[0].vol_file_name, "sgilabel", 8);
 }
 
 static sgiinfo *fill_sgiinfo(void);
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index 26a919536..92f0e3b1a 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -522,7 +522,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
                 //STORE_LE(boot_blk->reserved2[3], 0,0,0);
                 STORE_LE(boot_blk->vi.ext_boot_sign, 0x29);
                 STORE_LE(boot_blk->vi.volume_id32, volume_id);
-                strncpy(boot_blk->vi.fs_type, "FAT32   ", sizeof(boot_blk->vi.fs_type));
+                memcpy(boot_blk->vi.fs_type, "FAT32   ", sizeof(boot_blk->vi.fs_type));
                 strncpy(boot_blk->vi.volume_label, volume_label, sizeof(boot_blk->vi.volume_label));
                 memcpy(boot_blk->boot_code, boot_code, sizeof(boot_code));
                 STORE_LE(boot_blk->boot_sign, BOOT_SIGN);
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index c6933c8d5..ae8103a52 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -105,14 +105,14 @@ static const struct namespace_descr ns_list[] = {
 /*
  * Upstream nsenter doesn't support the short option for --preserve-credentials
  */
-static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t+S+G+r::w::F";
+static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t:+S:+G:+r::w::F";
 
 #if ENABLE_LONG_OPTS
 static const char nsenter_longopts[] ALIGN1 =
         "user\0"                        Optional_argument       "U"
         "ipc\0"                         Optional_argument       "i"
         "uts\0"                         Optional_argument       "u"
-        "network\0"                     Optional_argument       "n"
+        "net\0"                         Optional_argument       "n"
         "pid\0"                         Optional_argument       "p"
         "mount\0"                       Optional_argument       "m"
         "target\0"                      Required_argument       "t"
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index 7c295da1f..fffee28a0 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -73,7 +73,7 @@
 #include "libbb.h"
 
 static void mount_or_die(const char *source, const char *target,
-                 const char *fstype, unsigned long mountflags)
+                const char *fstype, unsigned long mountflags)
 {
         if (mount(source, target, fstype, mountflags, NULL)) {
                 bb_perror_msg_and_die("can't mount %s on %s (flags:0x%lx)",
diff --git a/util-linux/volume_id/Config.src b/util-linux/volume_id/Config.src
index ac208c9cc..fe3b14a71 100644
--- a/util-linux/volume_id/Config.src
+++ b/util-linux/volume_id/Config.src
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
 config VOLUMEID