diff options
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/Config.src | 6 | ||||
| -rw-r--r-- | util-linux/hwclock.c | 7 | ||||
| -rw-r--r-- | util-linux/mkfs_ext2.c | 13 |
3 files changed, 11 insertions, 15 deletions
diff --git a/util-linux/Config.src b/util-linux/Config.src index e97125917..3c3e05ec4 100644 --- a/util-linux/Config.src +++ b/util-linux/Config.src @@ -472,7 +472,7 @@ config FEATURE_USE_TERMIOS config VOLUMEID bool #No description makes it a hidden option - default y + default n config FEATURE_VOLUMEID_EXT bool "Ext filesystem" @@ -725,7 +725,7 @@ config FEATURE_MOUNT_HELPERS The idea is to use such virtual filesystems in /etc/fstab. config FEATURE_MOUNT_LABEL - bool "Support specifiying devices by label or UUID" + bool "Support specifying devices by label or UUID" default y depends on MOUNT select VOLUMEID @@ -930,7 +930,7 @@ config FEATURE_MTAB_SUPPORT If you must use this, keep in mind it's inherently brittle (for example a mount under chroot won't update it), can't handle modern features like separate per-process filesystem namespaces, requires - that your /etc directory be writeable, tends to get easily confused + that your /etc directory be writable, tends to get easily confused by --bind or --move mounts, won't update if you rename a directory that contains a mount point, and so on. (In brief: avoid.) diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index 416271b31..3da2e23c3 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c @@ -12,13 +12,6 @@ #include <sys/utsname.h> #include "rtc_.h" -#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS -# ifndef _GNU_SOURCE -# define _GNU_SOURCE -# endif -#endif - - /* diff code is disabled: it's not sys/hw clock diff, it's some useless * "time between hwclock was started and we saw CMOS tick" quantity. * It's useless since hwclock is started at a random moment, diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index fd54734fc..14feb9288 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c @@ -140,7 +140,7 @@ static void PUT(uint64_t off, void *buf, uint32_t size) // only for directories, which never need i_size_high). // // Standard mke2fs creates a filesystem with 256-byte inodes if it is -// bigger than 0.5GB. So far, we do not do this. +// bigger than 0.5GB. // Standard mke2fs 1.41.9: // Usage: mke2fs [-c|-l filename] [-b block-size] [-f fragment-size] @@ -210,17 +210,20 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv) // using global "option_mask32" instead of local "opts": // we are register starved here - opt_complementary = "-1:b+:m+:i+"; + opt_complementary = "-1:b+:i+:I+:m+"; /*opts =*/ getopt32(argv, "cl:b:f:i:I:J:G:N:m:o:g:L:M:O:r:E:T:U:jnqvFS", - NULL, &bs, NULL, &bpi, &user_inodesize, NULL, NULL, NULL, - &reserved_percent, NULL, NULL, &label, NULL, NULL, NULL, NULL, NULL, NULL); + /*lbfi:*/ NULL, &bs, NULL, &bpi, + /*IJGN:*/ &user_inodesize, NULL, NULL, NULL, + /*mogL:*/ &reserved_percent, NULL, NULL, &label, + /*MOrE:*/ NULL, NULL, NULL, NULL, + /*TU:*/ NULL, NULL); argv += optind; // argv[0] -- device // open the device, check the device is a block device xmove_fd(xopen(argv[0], O_WRONLY), fd); fstat(fd, &st); if (!S_ISBLK(st.st_mode) && !(option_mask32 & OPT_F)) - bb_error_msg_and_die("not a block device"); + bb_error_msg_and_die("%s: not a block device", argv[0]); // check if it is mounted // N.B. what if we format a file? find_mount_point will return false negative since |