diff --git a/Documentation/TODO b/Documentation/TODO index 6d4c1b278..3b39ef5b9 100644 --- a/Documentation/TODO +++ b/Documentation/TODO @@ -24,7 +24,7 @@ script records in the timing file - for example timing file format: - + [ | ...] O 0.001296 256 @@ -56,7 +56,7 @@ hwclock - use /var/lib/hwclock/drift to store hw-clock drift numbers. - use /etc/adjtime as read-only for UTC/LOCAL information only - the /var/lib/hwclock/drift should be implemented backwardly compatible, - it means use the file only if exists, otherwise follow /etc/adjtime + it means use the file only if exists, otherwise follow /etc/adjtime bash completion --------------- @@ -88,7 +88,7 @@ partx ----- - support mapping by device-mapper if argv[0] is "kpartx" or --dm option is used. - + getopt ------ @@ -123,7 +123,7 @@ login-utils: libblkid -------- - - (!) add support for BitLocker Drive Encryption + - (!) add support for BitLocker Drive Encryption https://github.com/karelzak/util-linux/issues/617 https://github.com/libyal/libbde/blob/master/documentation/BitLocker%20Drive%20Encryption%20(BDE)%20format.asciidoc @@ -141,7 +141,7 @@ misc - add mllockall() and SCHED_FIFO to hwclock, see http://lkml.org/lkml/2008/10/12/132 - + --------------- exotic requests diff --git a/Documentation/cal.txt b/Documentation/cal.txt index 638ac9dff..83051657e 100644 --- a/Documentation/cal.txt +++ b/Documentation/cal.txt @@ -10,13 +10,13 @@ that even if I was dumb enough to try. From this we can easily calculate the day of week for any date. The algorithm for a zero based day of week: calculate the number of days in all prior years (year-1)*365 - add the number of leap years (days?) since year 1 + add the number of leap years (days?) since year 1 (not including this year as that is covered later) add the day number within the year this compensates for the non-inclusive leap year calculation if the day in question occurs before the gregorian reformation - (3 sep 1752 for our purposes), then simply return + (3 sep 1752 for our purposes), then simply return (value so far - 1 + SATURDAY's value of 6) modulo 7. if the day in question occurs during the reformation (3 sep 1752 to 13 sep 1752 inclusive) return THURSDAY. This is my diff --git a/Documentation/example.files/motd b/Documentation/example.files/motd index 842a6f3bc..c78c774df 100644 --- a/Documentation/example.files/motd +++ b/Documentation/example.files/motd @@ -1,6 +1,6 @@ |^^^^^^| - | | _____________________ + | | _____________________ | | / \ | (o)(o) | | @ _) | BOGUS man!! | diff --git a/Documentation/getopt_changelog.txt b/Documentation/getopt_changelog.txt index 0c114b49a..ec968f668 100644 --- a/Documentation/getopt_changelog.txt +++ b/Documentation/getopt_changelog.txt @@ -32,7 +32,7 @@ 19980611: Fixed --version bug (was not available, though documented!) 19980611: Removed compiler warnings. 19980603: Bumped up version number to 1.0.1 -19980603: Fixed sizeof() bug (should be strlen) in getopt.c, thanks to +19980603: Fixed sizeof() bug (should be strlen) in getopt.c, thanks to Bob Proulx (rwp@hprwp.fc.hp.com). 19980505: Changed date field in LSM to proper syntax 19980505: Released version 1.0 diff --git a/Documentation/howto-compilation.txt b/Documentation/howto-compilation.txt index 5ae331096..e106fcf20 100644 --- a/Documentation/howto-compilation.txt +++ b/Documentation/howto-compilation.txt @@ -43,7 +43,7 @@ Compile certain portion It's also possible to disable all the programs and enable only wanted. For example: - + ./configure --disable-all-programs --enable-fallocate Note that the configure script tracks dependencies between libs and diff --git a/Documentation/howto-tests.txt b/Documentation/howto-tests.txt index 4d302beea..b8a620073 100644 --- a/Documentation/howto-tests.txt +++ b/Documentation/howto-tests.txt @@ -113,7 +113,7 @@ TS_OPT_testdir_[testscript_]memcheck="" Run certain tests with valgrind. Similar usage like TS_OPT_*_fake above. -External services +External services ----------------- Travis CI - automatically executed for all github commits. @@ -141,6 +141,6 @@ Drone.io - automatically executed for all github commits. ret=0 travis_script || ret=$? travis_after_script - exit $ret - + exit $ret + yes, it shares the setup functions with travis-ci. diff --git a/Documentation/hwclock.txt b/Documentation/hwclock.txt index e76762334..0da6f701f 100644 --- a/Documentation/hwclock.txt +++ b/Documentation/hwclock.txt @@ -1,3 +1,3 @@ -Hwclock is a program that runs under Linux and sets and queries the +Hwclock is a program that runs under Linux and sets and queries the Hardware Clock, which is often called the Real Time Clock, RTC, or CMOS clock. diff --git a/Documentation/modems-with-agetty.txt b/Documentation/modems-with-agetty.txt index 44a611e2a..deda18e20 100644 --- a/Documentation/modems-with-agetty.txt +++ b/Documentation/modems-with-agetty.txt @@ -42,7 +42,7 @@ the &D2 and &C1 commands may not be entirely standard. Exit kermit/minicom. -Put the command +Put the command /sbin/agetty -w 2400 ttyS1 @@ -61,11 +61,11 @@ for the same setup as above, use the following agetty command in your The final \015 is an octal coding of the carriage return character ending the command string. -If you're using simpleinit (part of this package) instead of the SYSV +If you're using simpleinit (part of this package) instead of the SYSV compatible init (you're most likely using the SYSV one!) then you must remove the single quotes from the command line above. -Note that the &W0 command was not used here since the modem will be +Note that the &W0 command was not used here since the modem will be initialized each time agetty starts. With a V.34 (28.8 kbps) modem try starting with a command like: diff --git a/Documentation/mount.txt b/Documentation/mount.txt index f75a6e25a..0256582e9 100644 --- a/Documentation/mount.txt +++ b/Documentation/mount.txt @@ -7,7 +7,7 @@ Stephen Tweedie . Andries Brouwer Adrian Bunk -Presently in util-linux maintained by Karel Zak . +Presently in util-linux maintained by Karel Zak . == Notes to developers == diff --git a/Documentation/poeigl.txt b/Documentation/poeigl.txt index 9f14d3f02..12cae63bf 100644 --- a/Documentation/poeigl.txt +++ b/Documentation/poeigl.txt @@ -16,10 +16,10 @@ Version 1.48 (6-Jun-97) After idea by Andries Brouwer. Version 1.47 (2-Apr-97) - Got new version of hostid.c and hostid.1 from + Got new version of hostid.c and hostid.1 from Sander van Malssen . - Removed premature endutent() call in login.c, simpleinit.c and - agetty.c to be compatible with the changed semantics of gnu libc2. + Removed premature endutent() call in login.c, simpleinit.c and + agetty.c to be compatible with the changed semantics of gnu libc2. Fix by Jesse Thilo . Version 1.46 (28-Jan-97) @@ -38,7 +38,7 @@ Version 1.45a (16-Dec-96) Some support for the RB-1 Cryptocard token for challenge/response authentication. This needs a DES library, either Eric Young's libdes, or the Koontz implementation, see cryptocard.c. - Initial support patch by Randolph Bentson, + Initial support patch by Randolph Bentson, Changed getpass() to use fputs() instead of fprintf(). @@ -75,7 +75,7 @@ Version 1.40a (29-Dec-95): , but somewhat butchered by me. Version 1.39 (25-Oct-95): - Lots of testing and bugfixes in agetty. Now the modem init stuff + Lots of testing and bugfixes in agetty. Now the modem init stuff should finally work (for me). Also wrote modem.agetty as an example on how to use agetty with a modem. Agetty now also supports baud rates of 38400, 57600, 115200 and @@ -85,7 +85,7 @@ Version 1.37 (15-Sep-95): Added -I and -w options to agetty.c for those that use agetty with modems. -Version 1.36 (25-Aug-95): +Version 1.36 (25-Aug-95): Enhanced /etc/usertty features with group support. Moved this part of login.c to checktty.c. One can now define classes of hosts and ttys and do access checking based on unix-group membership. See @@ -103,12 +103,12 @@ Version 1.36 (25-Aug-95): Version 1.35 (7-Aug-95): login.c: Much improved features for the usertty file, allows - access control based on both hostnames/addresses and line. See the + access control based on both hostnames/addresses and line. See the about.usertty file and the man-page. Fixed agetty so it doesn't fiddle with the ut_id field in the utmp record, this should prevent growing utmps on systems with - more than 10 login lines. Fix suggested and checked by Alan Wendt + more than 10 login lines. Fix suggested and checked by Alan Wendt in his agetty.1.9.1a. Agetty now installs as agetty again, not as getty. @@ -118,8 +118,8 @@ Version 1.35 (7-Aug-95): Version 1.33a (20-Jun-95): rchatfie@cavern.nmsu.edu ("rc.") suggested that I should remove - the #ifndef linux around the special logging of dial-up - logins. This is now done, so each login via a serial port + the #ifndef linux around the special logging of dial-up + logins. This is now done, so each login via a serial port generates a separate DIALUP syslog entry. Version 1.33 (5-Jun-95): @@ -153,8 +153,8 @@ Version 1.32 should. Version 1.31b (2-Feb-95): - Daniel Quinlan and Ross Biro - suggested a patch to login.c that allows for + Daniel Quinlan and Ross Biro + suggested a patch to login.c that allows for shell scripts in the shell field of /etc/passwd, so one can now have (as a line in /etc/passwd): bye::1000:1000:Outlogger:/bin:echo Bye @@ -167,13 +167,13 @@ Version 1.31a (28-Oct-94): the reboot. Version 1.30 (17-Sep-94): - tobias@server.et-inf.fho-emden.de (Peter Tobias) has made a more + tobias@server.et-inf.fho-emden.de (Peter Tobias) has made a more advanced hostname command that understands some options such as -f for FQDN etc. I'll not duplicate his work. Use his hostname package if you wish. svm@kozmix.xs4all.nl (Sander van Malssen) provided more features - for the /etc/issue file in agetty. \U and \u now expand to the + for the /etc/issue file in agetty. \U and \u now expand to the number of current users. It is now possible to state the value of TERM on the agetty command @@ -210,7 +210,7 @@ Version 1.28a (16-May-94): Version 1.27 (10-May-94): Changed login.c, so all bad login attempts are logged, and added usertty security feature. See about.usertty for an explanation. - There's no longer a limit of 20 chars in the TERM environment + There's no longer a limit of 20 chars in the TERM environment variable. Suggested by Nicolai Langfeldt Added #ifdef HAVE_QUOTA around quota checks. Enable them if @@ -221,7 +221,7 @@ Version 1.27 (10-May-94): Now wtmp is locked and unlocked around writes to avoid mangling. Due to Jaakko Hyv{tti . - Wrt. agetty: A \o in /etc/issue now inserts the domainname, as + Wrt. agetty: A \o in /etc/issue now inserts the domainname, as set by domainname(1). Sander van Malssen provided this. This is being used under Linux 1.1.9 @@ -229,7 +229,7 @@ Version 1.27 (10-May-94): options. Added man-pages for wall, cage, who. Version 1.26 alpha (25-Apr-94): - Added patch from Bill Reynolds to + Added patch from Bill Reynolds to simpleinit, so it will drop into single user if /etc/rc fails, eg. from fsck. @@ -241,13 +241,13 @@ Version 1.25 (9-Feb-94): Version 1.24 (23-Jan-94): changes since 1.22 Christian von Roques provided a patch - that cleans up the handling of the -L option on agetty. + that cleans up the handling of the -L option on agetty. Rik Faith enhanced several man-pages... Version 1.23 (11-Dec-93): changes since 1.21 Mitchum DSouza provided the hostid(1) code. It needs libc 4.4.4 or later and a Linux 0.99.14 kernel or later. It can set and print - the world unique hostid of the machine. This may be used in + the world unique hostid of the machine. This may be used in connection with commercial software licenses. God forbid! I added the -v option, and munged the code a bit, so don't blame Mitch if you don't like it. @@ -268,7 +268,7 @@ Version 1.21 (30-Oct-93): changes since 1.20 /etc/rc is run, to put a correct timestamp on it. Daniel Thumim suggested this fix. - The source and Makefile is prepared for optional installation of + The source and Makefile is prepared for optional installation of binaries in /sbin instead of /etc, and logfiles in /usr/adm instead of /etc. See and change the Makefile to suit your preferences. Rik Faith and Stephen Tweedie inspired this change. @@ -366,8 +366,8 @@ Version 1.8a (13-Dec-92): changes since 1.7: Version 1.7: 26-Oct-92 changes since 1.6: This is for Linux 0.97PL4 or later. - Thanks to Werner Almesberger, init now has support for a - singleuser mode. + Thanks to Werner Almesberger, init now has support for a + singleuser mode. Login now supports the -h option, used in connection with TCP/IP. (rlogin/telnet) @@ -380,7 +380,7 @@ Version 1.7: 26-Oct-92 changes since 1.6: Version 1.6 (29-Aug-92): changes since 1.5: This is for Linux 0.97P1+ or later. - + Login now uses the newly implemented vhangup() sys-call, to prevent snooping on the tty. An alternative getpass() function is now provided with login, because @@ -400,7 +400,7 @@ Version 1.4 (4-Jul-92): changes since 1.3: Init now handles the SIGINT signal. When init gets a SIGINT it will call /usr/bin/reboot and thereby gently reboot the machine. This makes sense because after Linux 0.96B-PL1 the key-combination - Ctrl-Alt-Del may send a SIGINT to init instead of booting the + Ctrl-Alt-Del may send a SIGINT to init instead of booting the machine the hard way without syncing or anything. You may want to get the admutils-1.1 package which includes a program @@ -411,7 +411,7 @@ Version 1.3 (14-Jun-92): changes since 1.2: The ioctl(TIOCSWINSZ) has been removed from login.c because it now works :-). - + login.c now supports a lastlog database. Several programs and pieces of source that were included in the 1.2 @@ -439,7 +439,7 @@ Version 1.2 (28-Feb-92): changes since 1.1: This requires a different patch to the kernel than that distributed with version 1.1 - Login no more sends superfluous chars from a password to the + Login no more sends superfluous chars from a password to the shell. It also properly prints a NL after the password. Agetty didn't set the erase character properly, it does now. @@ -459,7 +459,7 @@ Version 1.1 (released 19-Feb-92): Changes since 1.0: I removed the qpl-init stuff. If people want to use it, they should get it from the source. I don't want to hack on it anymore. - A couple of people reported problems with getty having problems + A couple of people reported problems with getty having problems with serial terminals. That was correct. I borrowed a null-modem from Tommy Thorn, and now the problems should be fixed. It seems that there is kept a lot of garbage in the serial buffers, flush @@ -478,7 +478,7 @@ agetty.c The getty program. From comp.sources.misc, by W.Z. Venema. Hacked a bit by me. write.c A write(1) command, used to pass messages between users - at different terminals. This code doubles as code for + at different terminals. This code doubles as code for a wall(1) command. Make a symlink: /usr/bin/wall -> /usr/bin/write for this. @@ -495,7 +495,7 @@ login. Login doesn't print /etc/motd, and doesn't check for mail if If /etc/nologin is present then login will print its contents and disallow any logins except root. -It might be a good idea to have a "rm -f /etc/nologin" line in one's +It might be a good idea to have a "rm -f /etc/nologin" line in one's /etc/rc file. If /etc/securetty is present it defines which tty's that root can login on. diff --git a/Documentation/releases/v2.15-ReleaseNotes b/Documentation/releases/v2.15-ReleaseNotes index 4b12f72b6..fdd257983 100644 --- a/Documentation/releases/v2.15-ReleaseNotes +++ b/Documentation/releases/v2.15-ReleaseNotes @@ -6,13 +6,13 @@ Release highlights ------------------ mkswap(8): - - mkswap like many others mkfs-like utils ERASES THE FIRST BLOCKS on - the device to remove old on-disk filesystems. mkswap refuses to + - mkswap like many others mkfs-like utils ERASES THE FIRST BLOCKS on + the device to remove old on-disk filesystems. mkswap refuses to erase the first block on a device with a disk label (SUN, BSD, ...) or on whole disk (e.g. /dev/sda). - DOES NOT SUPPORT v0 SWAP SPACE any more. The kernel has not - supported v0 swap space format since 2.5.22. The new version v1 is + supported v0 swap space format since 2.5.22. The new version v1 is supported since 2.1.117. swapon(8): @@ -30,25 +30,25 @@ cal(1): - determines the first day of week from the locale. libblkid, blkid(8) and findfs(8): - The libblkid library has been moved from e2fsprogs to util-linux-ng. The + The libblkid library has been moved from e2fsprogs to util-linux-ng. The library has been extended and now includes: - + - low-level probing API that is useful for example for udev rules (cmdline: blkid -p -o udev ) - very high-level API that provides portable interface for LABELs and UUIDs evaluation on 2.4, 2.6 and udev-based system. It's recommended - to use "blkid -L|-U" in your scripts rather than directly read + to use "blkid -L|-U" in your scripts rather than directly read /dev/disk/by-* symlinks. - the old ABI and API is backwardly compatible with the current version from e2fsprogs. - All utils (mount, swapon, fsck, ...) in the package is possible to link - against this new library, or the old version from e2fsprogs, or + All utils (mount, swapon, fsck, ...) in the package is possible to link + against this new library, or the old version from e2fsprogs, or libvolume_id from udev package. - The default is still libblkid from e2fsprogs. The new library could be + The default is still libblkid from e2fsprogs. The new library could be enabled by "--with-fsprobe=builtin" configure option. The libvolume_id from udev and vol_id command is deprecated now. @@ -64,11 +64,11 @@ flock(1): - allows lock directory fsck.cramfs: - - automatically detects the image endianness, and can work on images of + - automatically detects the image endianness, and can work on images of either endianness. mkfs.cramfs: - - now accepts a new optional parameter (-N) that allows creating + - now accepts a new optional parameter (-N) that allows creating the cramfs image in either endianness. renice(1): @@ -77,14 +77,14 @@ renice(1): hwclock(8) - supports new command line option "--systz" to reset the System Time based on the current timezone. Since the system clock time is already - set from the hardware clock by the kernel (when compiled with + set from the hardware clock by the kernel (when compiled with CONFIG_RTC_HCTOSYS), there's no particular need to read the hardware clock again. ionice(1): - supports new command line option "-t" option to ignore failure to set requested priority. This might be of use in case something (selinux, - old kernel, etc.) does not allow the requested scheduling priority + old kernel, etc.) does not allow the requested scheduling priority to be set. - the command line option "-p" handles multiple PIDs now. @@ -97,8 +97,8 @@ ipcmk(1): lscpu(1): - this NEW COMMAND gathers CPU architecture information like number - of CPUs, threads, cores, sock, NUMA nodes, information about CPU - caches, information about hypervisor and virtualization support, + of CPUs, threads, cores, sock, NUMA nodes, information about CPU + caches, information about hypervisor and virtualization support, ..etc. and prints it in human-readable or parse-able format. namei(1): diff --git a/Documentation/releases/v2.17-ReleaseNotes b/Documentation/releases/v2.17-ReleaseNotes index 4988b4f71..91e8e75b8 100644 --- a/Documentation/releases/v2.17-ReleaseNotes +++ b/Documentation/releases/v2.17-ReleaseNotes @@ -5,11 +5,11 @@ Release highlights ------------------ fallocate: - - this NEW COMMAND is a command line interface to fallocate + - this NEW COMMAND is a command line interface to fallocate Linux syscall and allows to preallocate blocks to a file. unshare - - this NEW COMMAND is a command line interface to unshare Linux syscall + - this NEW COMMAND is a command line interface to unshare Linux syscall and allows to run program with some namespaces unshared from parent. wipefs @@ -22,14 +22,14 @@ libblkid: * ioctl - supported since kernel 2.6.32 * sysfs - supported since kernel 2.6.31 - * fallback for DM, MD, LVM and EVMS on old kernels (base on code + * fallback for DM, MD, LVM and EVMS on old kernels (base on code from xfsprogs/libdisk) The topology support is mostly designed for mkfs programs or partitioning tools (already used in mkfs.xfs, mkex2fs, libparted and fdisk) - + - libblkid supports partition tables parsing (currently supported are - aix, bsd, dos, mac, gpt, minix, sgi, solaris, sun and unixware). This + aix, bsd, dos, mac, gpt, minix, sgi, solaris, sun and unixware). This functionality is designed for mkfs programs, DeviceKits, [k]partx or so. - libblkid API documentation is available at diff --git a/Documentation/releases/v2.18-ReleaseNotes b/Documentation/releases/v2.18-ReleaseNotes index f8a31d4c3..61257c7b0 100644 --- a/Documentation/releases/v2.18-ReleaseNotes +++ b/Documentation/releases/v2.18-ReleaseNotes @@ -1,8 +1,8 @@ Util-linux-ng 2.18 Release Notes ================================ -The util-linux-ng package does not contain rdev(8), ramsize(8), -vidmode(8) and rootflags(8) anymore. +The util-linux-ng package does not contain rdev(8), ramsize(8), +vidmode(8) and rootflags(8) anymore. The fdisk(8) command does not use DOS-compatible mode and cylinders as display units by default. The old deprecated DOS behavior could be enabled by 'c' and @@ -17,8 +17,8 @@ libmount: projects. - the library API is still officially unstable. The library provides - fstab, mtab and mountinfo parser, routines for work with parsed - data and mount options, mtab locking, etc. The high-level API for + fstab, mtab and mountinfo parser, routines for work with parsed + data and mount options, mtab locking, etc. The high-level API for mount(2) is planned for the next major release. For more details see: http://thread.gmane.org/gmane.linux.utilities.util-linux/3239 @@ -26,7 +26,7 @@ libmount: yet. This change is planned for util-linux-ng-2.19. findmnt(8): - - this NEW COMMAND is a command line interface to the libmount library + - this NEW COMMAND is a command line interface to the libmount library for work with mountinfo, fstab and mtab files fsfreeze(8): @@ -38,13 +38,13 @@ swaplabel(8): blkid(8): - supports new command line option "-i" to print I/O Limits - - supports new command line option "-n" to restrict probing functions to + - supports new command line option "-n" to restrict probing functions to defined list of superblock types (names). - returns details from partition table (type, flags, uuid, ...) chrt(1): - - supports new command line option "-R/--reset-on-fork" to enable + - supports new command line option "-R/--reset-on-fork" to enable SCHED_RESET_ON_FORK flag fdisk(8): @@ -53,11 +53,11 @@ fdisk(8): (all these changes are already in the release 2.17.2) hwclock(8): - - supports new command line option "--predict" to predict what the RTC will + - supports new command line option "--predict" to predict what the RTC will read at time given by the --date option based on the adjtime file. ldattach(8): - - supports new command line option "-i/--iflag" to sets the specified bits + - supports new command line option "-i/--iflag" to sets the specified bits in the c_iflag word of the serial line. fallocate(1), losetup(8) and mount(8): diff --git a/Documentation/releases/v2.19-ReleaseNotes b/Documentation/releases/v2.19-ReleaseNotes index 1d0c3182d..6406b712d 100644 --- a/Documentation/releases/v2.19-ReleaseNotes +++ b/Documentation/releases/v2.19-ReleaseNotes @@ -37,9 +37,9 @@ losetup(8), mount(8): (requires kernel >= 2.6.37) fsck(8): - - supports new command line option "-l" to lock whole-disk device by + - supports new command line option "-l" to lock whole-disk device by exclusive flock(2). This option is recommended when more fsck(8) instances - are executed in the same time. + are executed in the same time. rtcwake(8): - supports new mode "show" to print the current RTC alarm time @@ -53,7 +53,7 @@ swapon(8): blkid(8): - low-level probing (-p) returns "8" exit code for ambivalent probing results - + libmount: - include file has been renamed from mount/mount.h to libmount/libmount.h diff --git a/Documentation/releases/v2.20-ReleaseNotes b/Documentation/releases/v2.20-ReleaseNotes index 549d89d87..8f125e47f 100644 --- a/Documentation/releases/v2.20-ReleaseNotes +++ b/Documentation/releases/v2.20-ReleaseNotes @@ -10,7 +10,7 @@ agetty(8): - mingetty features have been merged to agetty chrt(1), taskset(1): - - supports new command line option "--all-tasks" to set or retrieve the + - supports new command line option "--all-tasks" to set or retrieve the scheduling attributes of all the tasks (threads) for a given PID dmesg(1): @@ -22,7 +22,7 @@ fdisk(8): - improved dialogs to be more user-friendly findmnt(8), partx(8), lsblk(8) - - support new command line option "--pairs" to enable key="value" + - support new command line option "--pairs" to enable key="value" output format findmnt(8): @@ -41,7 +41,7 @@ libmount: - the API officially stable lsblk(8): - - supports new columns: + - supports new columns: TYPE - device type RQ-SIZE - queue request size STATE - device state (e.g. running, suspended) @@ -69,7 +69,7 @@ simpleinit: - this set of deprecated utils has been REMOVED wall(1): - - support new command line option "--timeout" to specify write timeout to + - support new command line option "--timeout" to specify write timeout to terminals in seconds. It's not supported to link with external (e.g. from e2fsprogs) libblkis and diff --git a/Documentation/releases/v2.21-ReleaseNotes b/Documentation/releases/v2.21-ReleaseNotes index 604627239..a69ee016d 100644 --- a/Documentation/releases/v2.21-ReleaseNotes +++ b/Documentation/releases/v2.21-ReleaseNotes @@ -34,17 +34,17 @@ losetup(8): table parser mount(8), umount(8): - - new pure libmount based mount(8) and umounts(8) commands are available, + - new pure libmount based mount(8) and umounts(8) commands are available, this experimental implementation could be enabled by --enable-new-mount - + agetty(8): - supports new command line options --nohints to disable hints about Num, Caps and Scroll Locks - - supports new command line option --remote to add a hostname to the + - supports new command line option --remote to add a hostname to the login(1) command line dmesg(1): - - supports new command line options --file to read the log from a file rather + - supports new command line options --file to read the log from a file rather than from kernel buffer fallocate(8): @@ -62,7 +62,7 @@ lscpu(1): - supports s390 topology description (polarization, books, ...) partx(8): - - supports partitioned loop devices (note that since kernel 3.2 partitioned + - supports partitioned loop devices (note that since kernel 3.2 partitioned loop devices are usable everywhere (including Fedora)) wipefs(8): diff --git a/Documentation/releases/v2.22-ReleaseNotes b/Documentation/releases/v2.22-ReleaseNotes index 656f67f8c..145713efc 100644 --- a/Documentation/releases/v2.22-ReleaseNotes +++ b/Documentation/releases/v2.22-ReleaseNotes @@ -16,7 +16,7 @@ partx(8): mount(8), umount(8), swapon(8), blkid(8) and findmnt(8): - supports PARTUUID= and PARTLABEL= tags to specify block devices by partition UUID or LABEL (for example for UEFI GPT). These tags are filesystem - independent and provide persistent configuration (your /etc/fstab setting + independent and provide persistent configuration (your /etc/fstab setting will not be affected by mkfs/mkswap changes). dmesg(1): @@ -26,7 +26,7 @@ dmesg(1): su(1): - has been merged from coreutils into util-linux - - utils-linux version uses /etc/pam.d/su-l PAM config file for --login + - utils-linux version uses /etc/pam.d/su-l PAM config file for --login (e.g. "su -") session. sulogin(8): @@ -40,9 +40,9 @@ eject(1): - supports new options --manualeject, --force and --no-partitions-unmount lslocks(1) - - this NEW COMMAND prints local system locks and it's replacement to very + - this NEW COMMAND prints local system locks and it's replacement to very long time unmaintained lslk(1) - + wdctl(8): - this NEW COMMAND shows hardware watchdog status @@ -65,7 +65,7 @@ fdisk(8) - does not print geometry in 'p'rint output in non-DOS mode libuuid: - - does NOT EXECUTE uuidd on demand, the daemon has to be started by + - does NOT EXECUTE uuidd on demand, the daemon has to be started by init scripts / systemd uuidd: @@ -79,7 +79,7 @@ fsck(8): - supports new option -r to report memory and runtime statistics lsblk(8): - - supports inverse trees (new option -s) + - supports inverse trees (new option -s) losetup(8): - supports option --detach-all to detach all loop devices @@ -90,7 +90,7 @@ build-system changes: - partx(8) enabled by default (see --disable-partx) - kill(1) enabled by default (see --disable-kill) - new non-recursive build-system - + Stable maintenance releases between v2.21 and v2.22 --------------------------------------------------- diff --git a/Documentation/releases/v2.23-ReleaseNotes b/Documentation/releases/v2.23-ReleaseNotes index ba26c79d9..3b53f6624 100644 --- a/Documentation/releases/v2.23-ReleaseNotes +++ b/Documentation/releases/v2.23-ReleaseNotes @@ -20,7 +20,7 @@ Release highlights ------------------ nsenter(1): - - this NEW COMMAND provides command line interface to setns() Linux syscall + - this NEW COMMAND provides command line interface to setns() Linux syscall and allows to run program with namespaces of other processes unshare(1): @@ -30,21 +30,21 @@ fdisk(8): - provides experimental support for GUID Partition Table (GPT), the implementation is still not complete and some (unimportant) features are missing. - - ~50% of fdisk code has been refactored, this task is going to be complete + - ~50% of fdisk code has been refactored, this task is going to be complete in the next release. The goal is to have libfdisk shared between all fdisks. partx(8): - supports new "update" command (implemented by BLKPG_RESIZE_PARTITION ioctl) mount(8): - - supports new userspace mount option x-mount.mkdir[=] to create + - supports new userspace mount option x-mount.mkdir[=] to create mountpoints on demand - the support for propagation flags has been improved, now the flags could be specified in /etc/fstab and used together with regular mount options. It's - also possible to specify more propagation flags together. This EXPERIMENTAL + also possible to specify more propagation flags together. This EXPERIMENTAL feature is implemented by additional mount(2) syscalls, because Linux does - not allow to use propagation flags with another options or more flags + not allow to use propagation flags with another options or more flags together. umount(8): @@ -91,14 +91,14 @@ swapon(8) and losetup(8): - the commands prints basic overview by default if no option specified column(1): - - supports new command line option --output-separator to specify table + - supports new command line option --output-separator to specify table output delimiter rename(1): - supports new command line option --symlink to rename symlink target hwclock(8): - - supports new command line option --compare to periodically compare + - supports new command line option --compare to periodically compare the Hardware Clock to the System Time (based on adjtimex -c) ipcs(1): diff --git a/Documentation/releases/v2.25-ReleaseNotes b/Documentation/releases/v2.25-ReleaseNotes index 45a38fb38..3e77b008b 100644 --- a/Documentation/releases/v2.25-ReleaseNotes +++ b/Documentation/releases/v2.25-ReleaseNotes @@ -17,19 +17,19 @@ libsmartcols: been originally developed for lsblk(8) and findmnt(8). cfdisk(8): - - the code been completely rewritten, now it uses libfdisk and libsmartcols, + - the code been completely rewritten, now it uses libfdisk and libsmartcols, supports GPT, SUN, SGI and BSD disk labels - the command is no more based on CHS addressing fdisk(8): - - no more print sizes in 1024-byte blocks, but in real sectors or human + - no more print sizes in 1024-byte blocks, but in real sectors or human readable sizes (MiB, TiB, etc.) - - allows to modify GPT partition attributes + - allows to modify GPT partition attributes lslogins(1): - this NEW COMMAND list information about users, groups and system accounts, provides data from last, wtmp, btmp, hust status, password expiration - settings, SELinux context, nologin setting, etc. + settings, SELinux context, nologin setting, etc. terminal-colors.d(5): - this new directory controls output colorization for various utilities @@ -41,7 +41,7 @@ cal(1): - supports new option --week to show week numbers fallocate(1): - - supports new option --dig-holes to detect and dig holes, it makes the + - supports new option --dig-holes to detect and dig holes, it makes the file sparse in-place, without using extra disk space. fstrim(1): @@ -65,10 +65,10 @@ lsblk(8): kill(1) and setterm(1): - the commands have been refactored to be more robust - + The build system has been improved to support to build only explicitly specified -utils or libs (e.g. --disable-all-programs --enable-libblkid to build only +utils or libs (e.g. --disable-all-programs --enable-libblkid to build only libblkid). The project test suite has been improved to be more portable and robust, project diff --git a/Documentation/releases/v2.28-ReleaseNotes b/Documentation/releases/v2.28-ReleaseNotes index 795f67f09..5e2ce1cd2 100644 --- a/Documentation/releases/v2.28-ReleaseNotes +++ b/Documentation/releases/v2.28-ReleaseNotes @@ -31,7 +31,7 @@ The command lsblk allows to sort output by unprinted columns (e.g. lsblk The command mount applies the nofail mount option to ENOMEDIUM errors. -The commands nsenter and unshare support a new option --cgroup for work with +The commands nsenter and unshare support a new option --cgroup for work with cgroups namespaces (CLONE_NEWCGROUP). The library libmount has been improved to properly detect already mounted btrfs diff --git a/Documentation/releases/v2.31-ReleaseNotes b/Documentation/releases/v2.31-ReleaseNotes index aabf83261..9caa35329 100644 --- a/Documentation/releases/v2.31-ReleaseNotes +++ b/Documentation/releases/v2.31-ReleaseNotes @@ -79,15 +79,15 @@ compatibility -l is now aliased to --localtime. Security issues --------------- -CVE-2016-2779 +CVE-2016-2779 The new experimental "su --pty" feature has been implemented to fix this issue. The feature is not enabled by default and the new command line option --pty is necessary. The classic way is to use setsid() to disable the ioctl TIOCSTI. Unfortunately, - setsid() has well-defined use cases in su(1) and runuser(1) and any changes - would introduce regressions. The setsid() also does not fix core of the problem + setsid() has well-defined use cases in su(1) and runuser(1) and any changes + would introduce regressions. The setsid() also does not fix core of the problem that is terminal file descriptors shared between privileged and unprivileged sessions. diff --git a/Documentation/releases/v2.33-ReleaseNotes b/Documentation/releases/v2.33-ReleaseNotes index 395c9ffbe..4da4c7af1 100644 --- a/Documentation/releases/v2.33-ReleaseNotes +++ b/Documentation/releases/v2.33-ReleaseNotes @@ -1,6 +1,6 @@ Util-linux 2.33 Release Notes ============================= - + Release highlights ------------------ @@ -49,7 +49,7 @@ SELinux and AppArmor, clear the signal when the process' credentials change. The commands fdisk(8) and sfdisk(8) print disk model name to simplify device identification. -The command "column --table-empty-lines" allows to use empty lines in formatted +The command "column --table-empty-lines" allows to use empty lines in formatted output. The command wipefs has been improved to postpone BLKRRPART (re-read partition @@ -77,13 +77,13 @@ scripts. Stable maintenance releases between v2.32 and v2.33 --------------------------------------------------- - + util-linux 2.32.1 [Jul 16 2018] - + * https://www.kernel.org/pub/linux/utils/util-linux/v2.32/v2.32.1-ReleaseNotes https://www.kernel.org/pub/linux/utils/util-linux/v2.32/v2.32.1-ChangeLog - - + + Changes between v2.32 and v2.33 ------------------------------- diff --git a/Documentation/releases/v2.34-ReleaseNotes b/Documentation/releases/v2.34-ReleaseNotes index 01ae1c85a..35ab7aae6 100644 --- a/Documentation/releases/v2.34-ReleaseNotes +++ b/Documentation/releases/v2.34-ReleaseNotes @@ -19,7 +19,7 @@ The new features based on this functionality are: http://karelzak.blogspot.com/2018/11/lsblk-merge.html The command umount(8) now supports user unmount for FUSE mounts. The requirement -is FUSE specific user_id= in /proc/self/mountinfo for the filesystem. +is FUSE specific user_id= in /proc/self/mountinfo for the filesystem. The command mount(8) now allows to use "--all -o remount". In this case all filters (-t and -O) are applied to the table of already mounted filesystems. @@ -52,8 +52,8 @@ tree-like output. This new feature is used by new lsblk --merge output. The systemd services for fstrim and uuidd now contains hardening settings to improve security and service isolation. -The command fstrim now trims also root filesystem on --fstab and checks for -read-only filesystems on --all and --fstab. +The command fstrim now trims also root filesystem on --fstab and checks for +read-only filesystems on --all and --fstab. The package build-system now accepts --enable-asan to compile commands and execute regression tests with addresses sanitizer. diff --git a/NEWS b/NEWS index a17abe0e5..499bf0330 100644 --- a/NEWS +++ b/NEWS @@ -1369,7 +1369,7 @@ HIGHLIGHTS for version 2.8: 1) New programs: - getopt(1) by Frodo Looijaard replaces the older bsd based version. Keywords: Backward compatible, supports --long options. -1) Removed programs: +1) Removed programs: - chroot: is no longer in util-linux. Get it free with GNU sh-utils - hostid: No-one could figure out the right way for this program to work. Another hostid program is included in poeigl @@ -1426,11 +1426,11 @@ See notes for 2.6 for installation instructions. This is a incremental release containing some fixes. A new release will be made later fixing the outstanding bugs. -- Things compiles and works better with recent releases of kernel, +- Things compiles and works better with recent releases of kernel, ncurses, and so forth: fdisk, more - Some fixes to make things compile out of the box on alphas. - There has been reported a problem with login and /etc/usertty. It - should be fixed. If you still have problems get a recent MAKEDEV and + should be fixed. If you still have problems get a recent MAKEDEV and use it to make new tty devices. They were renumbered sometime during the 1.3 phase of the kernel. - ipcs now displays the key of the structures. @@ -1456,7 +1456,7 @@ HIGHLIGHTS for version 2.6: tsx-11.mit.edu:/pub/sources/sbin sunsite.unc.edu:/pub/Linux/system/Daemons -2) Bugfixes, additions: +2) Bugfixes, additions: - SECURITY: All known holes in mount have been fixed. UPGRADE NOW if you haven't already! - Portability enhancements to the minix filesystem utils (m68k and @@ -1464,7 +1464,7 @@ HIGHLIGHTS for version 2.6: - passwd/chsh/chfn will not mess up the passwd file on a NIS machine - others too numerous to enumerate. -3) New programs: +3) New programs: - vigr (it's like vipw) - Introducing hwclock. A complete rewrite of the latest available clock source. It supports intel/CMOS, /dev/rtc and linux/m68k @@ -1514,7 +1514,7 @@ HIGHLIGHTS for version 2.5: locking, and several security holes have been patched. Further, chsh and chfn can be configured at compile time to require a password before updates and chsh can be configured to only use shells from /etc/shells. - + HIGHLIGHTS for version 2.4 (2.3 was never released): 0) Michael K. Johnson is the interim maintainer @@ -1662,7 +1662,7 @@ login-utils: simpleinit: Peter Orbaek ftp.daimi.aau.dk:/pub/linux/poe/poeigl-1.37.tar.gz vipw: 5.16 (Berkeley) 3/3/91, with modifications by Mike Grupenhoff - + wall: 8.2 (Berkeley) 11/16/93 (With changes so that damaging escape sequences cannot be sent.) ftp.cdrom.com:/pub/bsd-sources/4.4BSD-Lite/usr/src/usr.bin @@ -1731,7 +1731,7 @@ mount: supports NFS stuff. I have modified the man pages. I have also added a small patch from Hamish Glen Coleman (t933093@minyos.xx.rmit.OZ.AU) which restores the -o semantics. - + Updated with Rick Sladkey's mount-0.99.14.tar.gz package, and with extra patches from Rick. Adam J. Richter allowed -t option to be optional. Patrick J. Volkerding (volkerdi@mhd1.moorhead.msus.edu) and diff --git a/disk-utils/cfdisk.8 b/disk-utils/cfdisk.8 index ff548d89d..9b7db00eb 100644 --- a/disk-utils/cfdisk.8 +++ b/disk-utils/cfdisk.8 @@ -58,7 +58,7 @@ Display help text and exit. .BR \-L , " \-\-color" [ = \fIwhen\fR] Colorize the output. The optional argument \fIwhen\fP can be \fBauto\fR, \fBnever\fR or \fBalways\fR. If the \fIwhen\fR argument is omitted, -it defaults to \fBauto\fR. The colors can be disabled, for the current built-in default +it defaults to \fBauto\fR. The colors can be disabled, for the current built-in default see \fB\-\-help\fR output. See also the COLORS section. .TP .BR \-V , " \-\-version" diff --git a/disk-utils/fsck.8 b/disk-utils/fsck.8 index bbbbc7161..aa48108c6 100644 --- a/disk-utils/fsck.8 +++ b/disk-utils/fsck.8 @@ -316,7 +316,7 @@ Display help text and exit. \fB\-\-version\fR Display version information and exit. .SH FILESYSTEM SPECIFIC OPTIONS -.B Options which are not understood by fsck are passed to the filesystem-specific checker! +.B Options which are not understood by fsck are passed to the filesystem-specific checker! .PP These options .B must diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c index 8ba28c2f5..3c041fab4 100644 --- a/disk-utils/mkfs.c +++ b/disk-utils/mkfs.c @@ -10,7 +10,7 @@ * Incorporated fix by Jonathan Kamens * 1999-02-22 Arkadiusz Miśkiewicz * - added Native Language Support - * + * */ /* diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index ed03f4a42..d6f5756a6 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -34,7 +34,7 @@ * * 30.10.94 - Added support for v2 filesystem * (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de) - * + * * 09.11.94 - Added test to prevent overwrite of mounted fs adapted * from Theodore Ts'o's (tytso@athena.mit.edu) mke2fs * program. (Daniel Quinlan, quinlan@yggdrasil.com) @@ -577,7 +577,7 @@ static void setup_tables(const struct fs_control *ctl) { */ static size_t do_check(const struct fs_control *ctl, char * buffer, int try, unsigned int current_block) { ssize_t got; - + /* Seek to the correct loc. */ if (lseek(ctl->device_fd, current_block * MINIX_BLOCK_SIZE, SEEK_SET) != current_block * MINIX_BLOCK_SIZE ) @@ -586,7 +586,7 @@ static size_t do_check(const struct fs_control *ctl, char * buffer, int try, uns /* Try the read */ got = read(ctl->device_fd, buffer, try * MINIX_BLOCK_SIZE); - if (got < 0) got = 0; + if (got < 0) got = 0; if (got & (MINIX_BLOCK_SIZE - 1 )) { printf(_("Weird values in do_check: probably bugs\n")); } diff --git a/include/plymouth-ctrl.h b/include/plymouth-ctrl.h index 50eaf0c7a..b6f129956 100644 --- a/include/plymouth-ctrl.h +++ b/include/plymouth-ctrl.h @@ -8,7 +8,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/libblkid/src/libblkid.sym b/libblkid/src/libblkid.sym index 65e4e22b7..bac443823 100644 --- a/libblkid/src/libblkid.sym +++ b/libblkid/src/libblkid.sym @@ -6,7 +6,7 @@ * The original libblkid from e2fsprogs (<=1.41.4) does not to use * symbol versioning -- all the original symbols are in BLKID_1.0 now. * - * Copyright (C) 2009-2014 Karel Zak + * Copyright (C) 2009-2014 Karel Zak */ BLKID_1.0 { global: diff --git a/libblkid/src/superblocks/bluestore.c b/libblkid/src/superblocks/bluestore.c index 7fcd11da6..2ff1f3518 100644 --- a/libblkid/src/superblocks/bluestore.c +++ b/libblkid/src/superblocks/bluestore.c @@ -6,7 +6,7 @@ * * * Ceph BlueStore is one of the supported storage - * methods for Object Storage Devices (OSDs). + * methods for Object Storage Devices (OSDs). * This is used to detect the backing block devices * used for these types of OSDs in a Ceph Cluster. * diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c index b5caab965..6f18ec482 100644 --- a/libfdisk/src/gpt.c +++ b/libfdisk/src/gpt.c @@ -610,7 +610,7 @@ static void gpt_mknew_header_common(struct fdisk_context *cxt, header->alternative_lba = cpu_to_le64(cxt->total_sectors - 1ULL); header->partition_entry_lba = cpu_to_le64(2ULL); } else { /* backup */ - uint64_t esz = (uint64_t) le32_to_cpu(header->npartition_entries) + uint64_t esz = (uint64_t) le32_to_cpu(header->npartition_entries) * sizeof(struct gpt_entry); uint64_t esects = (esz + cxt->sector_size - 1) / cxt->sector_size; @@ -904,7 +904,7 @@ static int valid_pmbr(struct fdisk_context *cxt) "will be corrected by write."), sz_lba, cxt->total_sectors - 1ULL); - /* Note that gpt_write_pmbr() overwrites PMBR, but we want to keep it valid already + /* Note that gpt_write_pmbr() overwrites PMBR, but we want to keep it valid already * in memory too to disable warnings when valid_pmbr() called next time */ pmbr->partition_record[part].size_in_lba = cpu_to_le32((uint32_t) min( cxt->total_sectors - 1ULL, 0xFFFFFFFFULL) ); diff --git a/libfdisk/src/iter.c b/libfdisk/src/iter.c index abc3d35a4..aca5f7c20 100644 --- a/libfdisk/src/iter.c +++ b/libfdisk/src/iter.c @@ -17,7 +17,7 @@ * application or share the same iterator, for this purpose libfdisk does not * provide reference counting for this object. It's recommended to initialize * the iterator by fdisk_new_iter() at begin of your function and then - * fdisk_free_iter() before you return from the function. + * fdisk_free_iter() before you return from the function. * * Don't forget to call fdisk_reset_iter() if you want to use the iterator more * than once. diff --git a/libmount/python/fs.c b/libmount/python/fs.c index 634a914ef..b35cfe33d 100644 --- a/libmount/python/fs.c +++ b/libmount/python/fs.c @@ -81,7 +81,7 @@ static void _dump_debug_string(const char *lead, const char *s, char quote) if (quote != 0) PySys_WriteStdout("%c", quote); - for (len = strlen(s); len > _PY_MAX_LEN; len -= _PY_MAX_LEN, s += _PY_MAX_LEN) + for (len = strlen(s); len > _PY_MAX_LEN; len -= _PY_MAX_LEN, s += _PY_MAX_LEN) PySys_WriteStdout(_PY_MAX_LEN_FMT, s); if (len > 0) diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym index b92728ff6..b7731b517 100644 --- a/libmount/src/libmount.sym +++ b/libmount/src/libmount.sym @@ -3,7 +3,7 @@ * * This file is part of libmount from util-linux project. * - * Copyright (C) 2011-2018 Karel Zak + * Copyright (C) 2011-2018 Karel Zak * * libmount is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by diff --git a/login-utils/last.c b/login-utils/last.c index 1b1a74191..20d69e9b5 100644 --- a/login-utils/last.c +++ b/login-utils/last.c @@ -457,7 +457,7 @@ static int list(const struct last_control *ctl, struct utmpx *p, time_t logout_t } else if (hours) { sprintf(length, " (%02d:%02d)", hours, abs(mins)); /* mins always shown as positive (w/o minus sign!) even if secs < 0 */ } else if (secs >= 0) { - sprintf(length, " (%02d:%02d)", hours, mins); + sprintf(length, " (%02d:%02d)", hours, mins); } else { sprintf(length, " (-00:%02d)", abs(mins)); /* mins always shown as positive (w/o minus sign!) even if secs < 0 */ } diff --git a/login-utils/lslogins.1 b/login-utils/lslogins.1 index f003ef264..1750fa3c0 100644 --- a/login-utils/lslogins.1 +++ b/login-utils/lslogins.1 @@ -76,7 +76,7 @@ Do not print a header line. Don't truncate output. .TP \fB\-o\fR, \fB\-\-output \fIlist\fP -Specify which output columns to print. +Specify which output columns to print. The default list of columns may be extended if \fIlist\fP is specified in the format \fI+list\fP. .TP diff --git a/login-utils/sulogin-consoles.h b/login-utils/sulogin-consoles.h index f762e873a..0bfbc3871 100644 --- a/login-utils/sulogin-consoles.h +++ b/login-utils/sulogin-consoles.h @@ -8,7 +8,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/m4/ul.m4 b/m4/ul.m4 index 0be8a91e6..ef9798ec5 100644 --- a/m4/ul.m4 +++ b/m4/ul.m4 @@ -291,7 +291,7 @@ AC_DEFUN([UL_REQUIRES_HAVE], [ dnl UL_REQUIRES_COMPILE(NAME, PROGRAM_PROLOGUE, PROGRAM_BODY, DESC, [VARSUFFIX=$1]) dnl dnl Modifies $build_ variable according to $enable_ and -dnl ability compile AC_LANG_PROGRAM(, ). +dnl ability compile AC_LANG_PROGRAM(, ). dnl dnl The is description used for warning/error dnl message (e.g. "foo support"). dnl diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8 index ac30bc6e9..1ff44403c 100644 --- a/misc-utils/blkid.8 +++ b/misc-utils/blkid.8 @@ -115,7 +115,7 @@ Don't encode non-printing characters. The non-printing characters are encoded by ^ and M- notation by default. Note that the \fB\-\-output udev\fR output format uses a different encoding which cannot be disabled. .TP -\fB\-D\fR, \fB\-\-no\-part\-details\fR +\fB\-D\fR, \fB\-\-no\-part\-details\fR Don't print information (PART_ENTRY_* tags) from partition table in low-level probing mode. .TP \fB\-g\fR, \fB\-\-garbage\-collect\fR diff --git a/misc-utils/fincore.c b/misc-utils/fincore.c index 03ff4d154..09f64ed6b 100644 --- a/misc-utils/fincore.c +++ b/misc-utils/fincore.c @@ -59,7 +59,7 @@ enum { static struct colinfo infos[] = { [COL_PAGES] = { "PAGES", 1, SCOLS_FL_RIGHT, N_("file data resident in memory in pages")}, - [COL_RES] = { "RES", 5, SCOLS_FL_RIGHT, N_("file data resident in memory in bytes")}, + [COL_RES] = { "RES", 5, SCOLS_FL_RIGHT, N_("file data resident in memory in bytes")}, [COL_SIZE] = { "SIZE", 5, SCOLS_FL_RIGHT, N_("size of the file")}, [COL_FILE] = { "FILE", 4, 0, N_("file name")}, }; diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c index ea29a8209..f1680656a 100644 --- a/misc-utils/mcookie.c +++ b/misc-utils/mcookie.c @@ -3,7 +3,7 @@ * Revised: Fri Mar 19 07:48:01 1999 by faith@acm.org * Public Domain 1995, 1999 Rickard E. Faith (faith@acm.org) * This program comes with ABSOLUTELY NO WARRANTY. - * + * * This program gathers some random bits of data and used the MD5 * message-digest algorithm to generate a 128-bit hexadecimal number for * use with xauth(1). diff --git a/po/cs.po b/po/cs.po index 9c5f0059c..581792a37 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3,7 +3,7 @@ # header is not removed and modified versions are marked # as such. # -# Czech translation of util-linux. +# Czech translation of util-linux. # This file is distributed under the same license as the util-linux package. # # Jiří Pavlovský , 1999 - 2001. @@ -27025,7 +27025,7 @@ msgstr "Vstupní řádek je příliš dlouhý." #~ msgid "current" #~ msgstr "současná" -# pid %d's _new_ scheduling policy +# pid %d's _new_ scheduling policy #~ msgid "new" #~ msgstr "nová" diff --git a/po/da.po b/po/da.po index 24c6ec5ed..5a5240d73 100644 --- a/po/da.po +++ b/po/da.po @@ -33,8 +33,8 @@ # ID -> id # implies -> medfører # initramfs -> et initramfs (da et filsystem) -# inode -> inode (en inode er noget som alle filer på ext3 og lignende -# filsystemer har. Det angiver vist et logisk sted på +# inode -> inode (en inode er noget som alle filer på ext3 og lignende +# filsystemer har. Det angiver vist et logisk sted på # disken hvor den ligger) Flertal inoder # label -> etiket (mærke (bruges for tag), mærkat) # link -> henvisning (lænke) @@ -58,9 +58,9 @@ # tag -> mærke # tray -> skuffe (ved cd-rom) # uncompressing -> udpakker (se decompression) -# UTC -> GMT -# (UTC (også kaldet zulutid) er den internationale tidszone, som (næsten) -# er det samme som Greenwich Mean Time. Tidsforskellen mellem dansk tid +# UTC -> GMT +# (UTC (også kaldet zulutid) er den internationale tidszone, som (næsten) +# er det samme som Greenwich Mean Time. Tidsforskellen mellem dansk tid # og UTC er plus én time ved normaltid og plus to timer ved sommertid. # Bruges ofte som synonymer. Dette til trods for, at UTC og GMT kan afvige # få tiendedele af et sekund fra hinanden på grund af Jordens uregelmæssige @@ -6675,7 +6675,7 @@ msgstr "Opdagede SUN-disketiket med forkert tjeksum. Du er nok nødt til at angi msgid "Detected sun disklabel with wrong version [%d]." msgstr "Detekterede sun-disketiket med forkert version [%d]." -# måske "sanity" i gåseøjne. Det er nok en speciel variabel, der +# måske "sanity" i gåseøjne. Det er nok en speciel variabel, der # (hvis den er forkert) angiver at der er noget 'sindssygt' galt #: libfdisk/src/sun.c:152 #, c-format @@ -19282,7 +19282,7 @@ msgid "duplicate use of an option" msgstr "dupliker brug af et tilvalg" # ifølge man-filen gør den "the screen" blank, det lader til at den -# styrer strømsparetilstand så 'blank skærm' vil nok være rigtigt i +# styrer strømsparetilstand så 'blank skærm' vil nok være rigtigt i # den her og de omkringstående #: term-utils/setterm.c:743 msgid "cannot force blank" diff --git a/po/it.po b/po/it.po index 1dafe6db3..06059724e 100644 --- a/po/it.po +++ b/po/it.po @@ -882,7 +882,7 @@ msgstr "Impossibile determinare il tipo di formato attuale" msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n" msgstr "faccia %s, %d tracce, %d sec/traccia. Capacità totale %d kB.\n" -# Questo messaggio e quello successivo concordano con "faccia" del messaggio +# Questo messaggio e quello successivo concordano con "faccia" del messaggio # sopra. #: disk-utils/fdformat.c:233 msgid "Double" diff --git a/po/pt_BR.po b/po/pt_BR.po index 503cd8c2a..83420cfd8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -986,7 +986,7 @@ msgstr "A assinatura antiga %s será removida por um comando de escrita." msgid "The old %s signature may remain on the device. It is recommended to wipe the device with wipefs(8) or fdisk --wipe, in order to avoid possible collisions." msgstr "A assinatura antiga %s pode ser mantida no dispositivo. É recomendado apagar o dispositivo com wipefs(8) ou fdisk --wipe, para evitar possíveis colisões." -# Alinhamento reajustado às demais opções abaixo; vide fdisk --help +# Alinhamento reajustado às demais opções abaixo; vide fdisk --help #: disk-utils/fdisk.c:817 #, c-format msgid "" diff --git a/sys-utils/adjtime_config.5 b/sys-utils/adjtime_config.5 index 03bf27a6f..049d4c585 100644 --- a/sys-utils/adjtime_config.5 +++ b/sys-utils/adjtime_config.5 @@ -16,7 +16,7 @@ or allow to use alternative location by command line options if write access to /etc is unwanted. The default clock mode is "UTC" if the file is missing. .PP -The Hardware Clock is usually not very accurate. However, much of its inaccuracy is completely predictable - it gains +The Hardware Clock is usually not very accurate. However, much of its inaccuracy is completely predictable - it gains or loses the same amount of time every day. This is called systematic drift. The util hwclock keeps the file /etc/adjtime, that keeps some historical information. For more details see "\fBThe Adjust Function\fR" and "\fBThe Adjtime File\fR" sections from diff --git a/sys-utils/blkzone.8 b/sys-utils/blkzone.8 index bf7f15f58..83d3dd7ce 100644 --- a/sys-utils/blkzone.8 +++ b/sys-utils/blkzone.8 @@ -56,7 +56,7 @@ The command \fBblkzone reset\fP is used to reset one or more zones. Unlike .BR sg_reset_wp (8), this command operates from the block layer and can reset a range of zones. .PP -By default, the command will operate from the zone at device +By default, the command will operate from the zone at device sector 0 and reset all zones. Options may be used to modify this behavior as well as specify the operation to be performed on the zone, as explained below. diff --git a/sys-utils/dmesg.1 b/sys-utils/dmesg.1 index 05ef911f7..2c06f69ad 100644 --- a/sys-utils/dmesg.1 +++ b/sys-utils/dmesg.1 @@ -218,7 +218,7 @@ The message sub-system prefix (e.g. "ACPI:"). The message timestamp. .TP .B timebreak -The message timestamp in short ctime format in \fB\-\-reltime\fR +The message timestamp in short ctime format in \fB\-\-reltime\fR or \fB\-\-human\fR output. .TP .B alert diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index c01a86826..c8b3419f7 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -503,7 +503,7 @@ set_hardware_clock_exact(const struct hwclock_control *ctl, * in the future) to both the time for which we are waiting and the * time that we will apply to the Hardware Clock, and start waiting * again. - * + * * For example, the caller requests that we set the Hardware Clock to * 1:02:03, with reference time (current system time) = 6:07:08.250. * We want the Hardware Clock to update to 1:02:04 at 6:07:09.250 on diff --git a/sys-utils/mount.c b/sys-utils/mount.c index b391347fc..825434fa7 100644 --- a/sys-utils/mount.c +++ b/sys-utils/mount.c @@ -201,7 +201,7 @@ static int mount_all(struct libmnt_context *cxt) /* Note that MNT_EX_SUCCESS return code does * not mean that FS has been really mounted * (e.g. nofail option) */ - if (mnt_context_get_status(cxt) + if (mnt_context_get_status(cxt) && mnt_context_is_verbose(cxt)) printf("%-25s: successfully mounted\n", tgt); } else diff --git a/term-utils/setterm.c b/term-utils/setterm.c index d7ed5e624..7b7c2ea6f 100644 --- a/term-utils/setterm.c +++ b/term-utils/setterm.c @@ -3,7 +3,7 @@ * Copyright (C) 1990 Gordon Irlam (gordoni@cs.ua.oz.au). Conditions of use, * modification, and redistribution are contained in the file COPYRIGHT that * forms part of this distribution. - * + * * Adaption to Linux by Peter MacDonald. * * Enhancements by Mika Liljeberg (liljeber@cs.Helsinki.FI) @@ -885,7 +885,7 @@ static int select_wait(void) static int resizetty(void) { - /* + /* * \e7 Save current state (cursor coordinates, attributes, * character sets pointed at by G0, G1). * \e[r Set scrolling region; parameters are top and bottom row. diff --git a/tests/ts/cal/weekarg b/tests/ts/cal/weekarg index d26906ee1..f51644a46 100755 --- a/tests/ts/cal/weekarg +++ b/tests/ts/cal/weekarg @@ -71,7 +71,7 @@ call_cal "Gregorian - Sunday-based, $PWEEK, 1 month" -s $WEEK $MYTIME call_cal "Julian - Monday-based, $PWEEK, 1 month" -mj $WEEK $MYTIME call_cal "Julian - Sunday-based, $PWEEK, 1 month" -sj $WEEK $MYTIME -call_cal_color "Gregorian - Monday-based, $PWEEK, 3 month" -3m $WEEK $MYTIME +call_cal_color "Gregorian - Monday-based, $PWEEK, 3 month" -3m $WEEK $MYTIME call_cal_color "Julian - Monday-based, $PWEEK, 3 month" -3mj $WEEK $MYTIME # tricky year, starts with a bit of 53 yet ends during 52 diff --git a/tests/ts/kill/kill_functions.sh b/tests/ts/kill/kill_functions.sh index cc0a44065..4ace3d984 100644 --- a/tests/ts/kill/kill_functions.sh +++ b/tests/ts/kill/kill_functions.sh @@ -26,4 +26,4 @@ function check_test_sigreceive { sleep $i done return $rc -} +} diff --git a/tests/ts/libmount/update b/tests/ts/libmount/update index 5437058a8..abc154782 100755 --- a/tests/ts/libmount/update +++ b/tests/ts/libmount/update @@ -31,7 +31,7 @@ rm -f $LIBMOUNT_MTAB # has_mtab=$( ts_has_mtab_support ) if [ "$has_mtab" == "yes" ]; then - + ts_init_subtest "mtab-mount" ts_run $TESTPROG --add /dev/sda1 /mnt/foo ext3 "rw,bbb,ccc,fff=FFF,ddd,noexec" ts_run $TESTPROG --add /dev/sdb1 /mnt/bar ext3 "gg=G,ffff=f,ro,noatime" diff --git a/tests/ts/lsblk/lsblk b/tests/ts/lsblk/lsblk index 76232f3b8..b790f7576 100755 --- a/tests/ts/lsblk/lsblk +++ b/tests/ts/lsblk/lsblk @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2018 Karel Zak +# Copyright (C) 2018 Karel Zak # # This file is part of util-linux. # diff --git a/tests/ts/lsblk/mk-input.sh b/tests/ts/lsblk/mk-input.sh index 8cd467e9a..2f9641f17 100644 --- a/tests/ts/lsblk/mk-input.sh +++ b/tests/ts/lsblk/mk-input.sh @@ -59,7 +59,7 @@ for x in ${DEVS}; do done # device/ files - if [ -d ${DEV}/device/ ]; then + if [ -d ${DEV}/device/ ]; then for f in $(find ${DEV}/device/ -maxdepth 1 -type f -not -path '*/uevent'); do if [ ! -f ${TS_DUMP}/${f} ]; then SUB=$(dirname $f) diff --git a/tests/ts/lsmem/lsmem b/tests/ts/lsmem/lsmem index 7fdee5582..9c431b57b 100755 --- a/tests/ts/lsmem/lsmem +++ b/tests/ts/lsmem/lsmem @@ -33,7 +33,7 @@ function do_lsmem { echo -e "\n---\n" >>${TS_OUTPUT} echo "\$ lsmem $opts" >>${TS_OUTPUT} ${TS_CMD_LSMEM} $opts --sysroot "${dumpdir}/${name}" >> $TS_OUTPUT 2>> $TS_ERRLOG - + } for dump in $(ls $TS_SELF/dumps/*.tar.bz2 | sort); do diff --git a/tests/ts/misc/flock b/tests/ts/misc/flock index 30be0405e..6b8edfafa 100755 --- a/tests/ts/misc/flock +++ b/tests/ts/misc/flock @@ -89,7 +89,7 @@ ts_finalize_subtest # expected is 3 seconds (see "sleep 3" for the general lock), but we should not # rely on exact number due to scheduler, machine load, etc. Let's check for # inmterval <3,5>. -# +# ts_init_subtest "time-check" TIMEDIFF=$(( $END - $START )) if [ $TIMEDIFF -lt 3 ]; then @@ -102,5 +102,5 @@ fi ts_finalize_subtest "diff ${TIMEDIFF} sec" -echo "Unlocked" >> $GEN_OUTPUT +echo "Unlocked" >> $GEN_OUTPUT ts_finalize diff --git a/tests/ts/sfdisk/dos b/tests/ts/sfdisk/dos index ba405b3f3..6887c47cb 100755 --- a/tests/ts/sfdisk/dos +++ b/tests/ts/sfdisk/dos @@ -45,7 +45,7 @@ ts_finalize_subtest ts_init_subtest "activate" -$TS_CMD_SFDISK --activate ${TS_DEVICE} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --activate ${TS_DEVICE} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_SFDISK --unit S --list ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle diff --git a/tests/ts/uuid/uuidgen b/tests/ts/uuid/uuidgen index 30058b470..f34b06c73 100755 --- a/tests/ts/uuid/uuidgen +++ b/tests/ts/uuid/uuidgen @@ -28,7 +28,7 @@ test_flag() { $TS_CMD_UUIDGEN $1 > "$OUTPUT_FILE" 2>>$TS_OUTPUT ret=$? $TS_HELPER_UUID_PARSER "$OUTPUT_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG - if [ $? -ne 0 ] || [ $ret -ne 0 ]; then + if [ $? -ne 0 ] || [ $ret -ne 0 ]; then echo "something wrong with $OUTPUT_FILE" >> $TS_OUTPUT cat $OUTPUT_FILE >> $TS_OUTPUT 2>> $TS_ERRLOG fi diff --git a/tools/checkdecl.sh b/tools/checkdecl.sh index 4ff4a10da..d2c8f95e6 100755 --- a/tools/checkdecl.sh +++ b/tools/checkdecl.sh @@ -16,6 +16,6 @@ if [ ! -f ./configure ]; then exit 1 fi -for decl in $(awk '/HAVE_DECL_.*ac_have_decl/ { print $2 }' configure); do +for decl in $(awk '/HAVE_DECL_.*ac_have_decl/ { print $2 }' configure); do git grep -nE '[[:blank:]]*#[[:blank:]]*if(ndef|def)[[:blank:]]*'$decl; done | sort -u diff --git a/tools/checkincludes.pl b/tools/checkincludes.pl index 8e6b716c1..c7e547f02 100755 --- a/tools/checkincludes.pl +++ b/tools/checkincludes.pl @@ -13,7 +13,7 @@ foreach $file (@ARGV) { ++$includedfiles{$1}; } } - + foreach $filename (keys %includedfiles) { if ($includedfiles{$filename} > 1) { print "$file: $filename is included more than once.\n"; diff --git a/tools/config-gen b/tools/config-gen index 5febdc466..bf638e8ee 100755 --- a/tools/config-gen +++ b/tools/config-gen @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (C) 2011 Karel Zak -# +# Copyright (C) 2011 Karel Zak +# test -f sys-utils/mount.c || { echo diff --git a/tools/config-gen-functions.sh b/tools/config-gen-functions.sh index 17e5a41e7..ea62432a1 100644 --- a/tools/config-gen-functions.sh +++ b/tools/config-gen-functions.sh @@ -1,5 +1,5 @@ # -# Copyright (C) 2011 Karel Zak +# Copyright (C) 2011 Karel Zak # diff --git a/tools/ko-release-gen b/tools/ko-release-gen index 193b5d547..9f904d1b1 100755 --- a/tools/ko-release-gen +++ b/tools/ko-release-gen @@ -70,7 +70,7 @@ add_file() { add_html_dir() { local src="$1" # source dir local tgt="$2" # target dir - + for fl in $(ls $src/*.html $src/*.css $src/*.png); do add_file $fl $tgt done diff --git a/tools/ko-release-push b/tools/ko-release-push index ef16fce97..530c3a7ca 100755 --- a/tools/ko-release-push +++ b/tools/ko-release-push @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Karel Zak +# Copyright (C) 2012 Karel Zak # # Usage: ko-release-push [ []] #