Changes between v2.25-rc1 and v2.25-rc2 -------------------------------------------- commit 8b9d1474a4bef66ca0c05a7ebd2341bb02016e24 Author: Karel Zak Date: Wed Jul 2 11:40:19 2014 +0200 build-sys: release++ (v2.25-rc2) Signed-off-by: Karel Zak NEWS | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) commit 8a2ab0eee8cbe15c6c14501ff547538555c1bf9a Author: Karel Zak Date: Wed Jul 2 11:38:19 2014 +0200 docs: update v2.25-ReleaseNotes Signed-off-by: Karel Zak Documentation/releases/v2.25-ReleaseNotes | 59 ++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) commit 2d5c127b4d4c23bed9f3b5860e935fde4f4e0e5b Author: Karel Zak Date: Wed Jul 2 11:35:53 2014 +0200 docs: update AUTHORS file Signed-off-by: Karel Zak AUTHORS | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 21dcf21ab7423c45ac6f4f5e1b0c801494bdbc88 Author: Karel Zak Date: Wed Jul 2 11:33:31 2014 +0200 po: merge changes Signed-off-by: Karel Zak po/ca.po | 918 ++++++++++++++++++++++++++-------------------------- po/cs.po | 936 +++++++++++++++++++++++++++-------------------------- po/da.po | 928 ++++++++++++++++++++++++++-------------------------- po/de.po | 933 +++++++++++++++++++++++++++-------------------------- po/es.po | 918 ++++++++++++++++++++++++++-------------------------- po/et.po | 918 ++++++++++++++++++++++++++-------------------------- po/eu.po | 921 ++++++++++++++++++++++++++-------------------------- po/fi.po | 927 ++++++++++++++++++++++++++-------------------------- po/fr.po | 936 +++++++++++++++++++++++++++-------------------------- po/gl.po | 911 +++++++++++++++++++++++++-------------------------- po/hr.po | 889 +++++++++++++++++++++++++------------------------- po/hu.po | 921 ++++++++++++++++++++++++++-------------------------- po/id.po | 919 ++++++++++++++++++++++++++-------------------------- po/it.po | 922 ++++++++++++++++++++++++++-------------------------- po/ja.po | 936 +++++++++++++++++++++++++++-------------------------- po/nl.po | 931 ++++++++++++++++++++++++++-------------------------- po/pl.po | 932 ++++++++++++++++++++++++++-------------------------- po/pt_BR.po | 937 +++++++++++++++++++++++++++-------------------------- po/ru.po | 921 ++++++++++++++++++++++++++-------------------------- po/sl.po | 918 ++++++++++++++++++++++++++-------------------------- po/sv.po | 918 ++++++++++++++++++++++++++-------------------------- po/tr.po | 918 ++++++++++++++++++++++++++-------------------------- po/uk.po | 938 +++++++++++++++++++++++++++-------------------------- po/util-linux.pot | 880 +++++++++++++++++++++++++------------------------- po/vi.po | 950 ++++++++++++++++++++++++++++-------------------------- po/zh_CN.po | 931 ++++++++++++++++++++++++++-------------------------- po/zh_TW.po | 928 ++++++++++++++++++++++++++-------------------------- 27 files changed, 12747 insertions(+), 12188 deletions(-) commit f3135f939d9530c44c8c86a8e408f1d60ca83c0e Author: Karel Zak Date: Tue Jul 1 13:51:32 2014 +0200 lib/ismounted: more robust buffer usage [clang-analyze] Signed-off-by: Karel Zak lib/ismounted.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 1bf9e264e269b6b23aae3d3269464580160f8e5c Author: Karel Zak Date: Tue Jul 1 13:48:01 2014 +0200 fsck: uninitialized argument value [clang-analyze] Signed-off-by: Karel Zak disk-utils/fsck.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1671b2ed1a22c913150d0820636cce2392df9469 Author: Karel Zak Date: Tue Jul 1 13:36:37 2014 +0200 libfdisk: fix possible memory leak [clang-analyze] Signed-off-by: Karel Zak libfdisk/src/label.c | 2 ++ 1 file changed, 2 insertions(+) commit a1da27a8c038d78014bee702dca9a3dc32bf1133 Author: Karel Zak Date: Tue Jul 1 13:25:46 2014 +0200 cfdisk: fix division by zero [clang-analyze] Signed-off-by: Karel Zak disk-utils/cfdisk.c | 6 ++++++ 1 file changed, 6 insertions(+) commit f3438ee8011e262d081534842f83a666c33cc0a3 Author: Karel Zak Date: Tue Jul 1 12:32:25 2014 +0200 libblkid: fix probe_ddf() [clang-analyze] Signed-off-by: Karel Zak libblkid/src/superblocks/ddf_raid.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit 23deb5aca0af0aa8c844ea2738fd65a7575c25d3 Author: Karel Zak Date: Tue Jul 1 10:36:40 2014 +0200 findmnt: simplify cache_set_targets() Signed-off-by: Karel Zak misc-utils/findmnt.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) commit 8642cd7b0f06157c1e4e8aae616bee78fa6a250f Author: Karel Zak Date: Tue Jul 1 10:34:09 2014 +0200 libmount: always use mnt_resolve_target() in mnt_fs_match_target() The requested path is also target mountpoint, so let's optimize realpath() usage as well. Signed-off-by: Karel Zak libmount/src/cache.c | 1 + libmount/src/fs.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) commit fb329bbc048861d6f47d33caf61f0c5b4ae68636 Author: Eric Rannaud Date: Thu Jun 26 22:18:48 2014 -0700 findmnt: use mnt_cache_set_targets() for non-kernel table findmnt compares the user-supplied path with each entry in the parsed table. To do this comparison, libmount attempts to canonicalize the target path of each table entry, when the entry does not originate from the kernel (kernel supplied target paths are already canonicalized). However, if one of these entries is an active mount point, stat(2) or readlink(2) on the mount target path can hang (e.g. unreachable NFS server). If the main table is not a kernel table, we parse /proc/self/mountinfo into a secondary table and call mnt_cache_set_targets(). This allows libmount to check that the target path of each entry in the main table is not an active mount point, so it can avoid canonicalizing it. Signed-off-by: Eric Rannaud misc-utils/findmnt.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) commit 0382ba32eda9e9d14d1e425390abf4b1fd1bda6b Author: Eric Rannaud Date: Thu Jun 26 22:17:18 2014 -0700 libmount: mnt_resolve_target: tiptoe around active mount points Current code in mnt_fs_match_target() and mnt_table_find_target() already does not canonicalize active mount points (when read from mountinfo), because they are already canonicalized by the kernel. Calling realpath(fs->target) on a mount point can hang -- e.g. if the NFS server is unreachable. This patch optionally extends this strategy to the general case, that is when @fs does not directly come from the kernel through mountinfo (for instance, it may have been parsed from /etc/fstab). Given @mtab parsed from mountinfo, and if mnt_cache_set_targets(cache, mtab) is used, then mnt_fs_match_target() and mnt_table_find_target() check whether @fs->target is a known mount point in the cached mountinfo, before attempting to canonicalize @fs->target, no matter where @fs itself comes from. If found in the cached mountinfo, @fs->target is not canonicalized. [kzak@redhat.com: - don't allocate libmnt_iter, - add docs for mnt_cache_set_targets(), - fallback to mnt_resolve_path() if no cache->mtab specified, - use streq_except_trailing_slash() to compare paths] Signed-off-by: Eric Rannaud Signed-off-by: Karel Zak libmount/src/cache.c | 132 ++++++++++++++++++++++++++++++++++++++------- libmount/src/fs.c | 6 ++- libmount/src/libmount.h.in | 4 ++ libmount/src/libmount.sym | 2 + libmount/src/tab.c | 8 +-- 5 files changed, 128 insertions(+), 24 deletions(-) commit 45e8cdba91799c4149c9c7f20bfa7606bf295f7f Author: Eric Rannaud Date: Thu Jun 26 22:17:17 2014 -0700 libmount: mnt_resolve_path: don't canonicalize fs->target for swap This is how mnt_table_find_target() does it. It makes sense because @fs->target is "none" for swap and is never a sensible match for a user-specified target. Signed-off-by: Eric Rannaud libmount/src/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ab131f00a2a5b81fbdf362b0b452291298523031 Author: Eric Rannaud Date: Thu Jun 26 22:17:16 2014 -0700 libmount: mnt_resolve_path: use strcmp() only if both are canonical Signed-off-by: Eric Rannaud libmount/src/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4b4e391a28b4dfeb69781c20190bffe8622d1907 Author: Karel Zak Date: Mon Jun 30 15:10:29 2014 +0200 fdisk: don't use --geom-* prefix for CHS options We already use --cylinders, --heads and --sectors for sfdisk, let's make new fdisk option compatible. Signed-off-by: Karel Zak disk-utils/fdisk.8 | 6 +++--- disk-utils/fdisk.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) commit 3175f0355269ee558d8ca1f21b429a4beb04033b Author: Karel Zak Date: Mon Jun 30 14:14:34 2014 +0200 libsmartcols: add note about deallocations Signed-off-by: Karel Zak libsmartcols/src/column.c | 3 ++- libsmartcols/src/line.c | 3 ++- libsmartcols/src/table.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) commit a6c6662d7c3e3849235797374bfa76e07606693b Author: Karel Zak Date: Mon Jun 30 11:03:12 2014 +0200 swapon: mark --sumarry as deprecated Signed-off-by: Karel Zak Documentation/deprecated.txt | 5 +++++ Documentation/releases/v2.25-ReleaseNotes | 3 +++ sys-utils/swapon.8 | 3 ++- sys-utils/swapon.c | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) commit 7471244148f96b601b05787501d02459b37f8c06 Author: Sami Kerola Date: Sun Jun 29 19:12:13 2014 +0100 swapon: align --summary fields This commit makes partitions and files to have remaining three columns aligned. Below print out demonstrates earlier misalignment. $ swapon -s Filename Type Size Used Priority /dev/sda2 partition 4194300 0 3 /home/src/util-linux/newswap file 496 0 -1 Signed-off-by: Sami Kerola sys-utils/swapon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6ec8a0bac52359a0d9aa8f011f59d1c5e878a14c Author: Benno Schulenberg Date: Sun Jun 29 17:49:43 2014 +0200 umount: slightly improve the man page Remove some stray words from option arguments. Signed-off-by: Benno Schulenberg sys-utils/umount.8 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) commit ab5b4f837dec4dc7d88cdfcc344b5c0c420c3eee Author: Benno Schulenberg Date: Sun Jun 29 17:49:42 2014 +0200 findmnt: minimally improve wording of usage text Also sort the options better and tweak whitespace. Signed-off-by: Benno Schulenberg misc-utils/findmnt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 9421a1a3b3e045d52f2a66eebe305d02102a8fb5 Author: Benno Schulenberg Date: Sun Jun 29 17:49:41 2014 +0200 findmnt: slightly improve wording and formatting in man page Signed-off-by: Karel Zak misc-utils/findmnt.8 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit b8ec0ab712709bbf7efad5dd6396e59448f0d7ae Author: Benno Schulenberg Date: Sun Jun 29 17:49:40 2014 +0200 lslogins: improve the columns information Some fixes for typos, whitespace and wordings. Signed-off-by: Benno Schulenberg login-utils/lslogins.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit ce969b16f072fc503d766626d62551ace31f42be Author: Benno Schulenberg Date: Sun Jun 29 17:49:39 2014 +0200 lslogins: improve wording and formatting of the man page Some typos, spacing, line breaks, and missing optional arguments. Signed-off-by: Benno Schulenberg login-utils/lslogins.1 | 73 +++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) commit d276d995726116228daf44cddbb13d10baa04915 Author: Benno Schulenberg Date: Sun Jun 29 17:49:38 2014 +0200 setterm: improve formatting and wording of usage text Mainly: showing that the word color is a placeholder by writing , showing some numbers as optional, and message levels and colors as not optional. Signed-off-by: Benno Schulenberg term-utils/setterm.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) commit e73a07208e4e776548b51b98775464b69d860555 Author: Benno Schulenberg Date: Sun Jun 29 17:49:37 2014 +0200 setterm: improve wording and formatting of the man page The main changes are: showing the arguments of boolean options as optional, improving the alphabetization, and restoring the --half-bright option that went missing in 2011. Signed-off-by: Benno Schulenberg term-utils/setterm.1 | 147 ++++++++++++++++++++++++++------------------------- 1 file changed, 76 insertions(+), 71 deletions(-) commit 575718a04aa0c053875041dc387e360f2dcaa70d Author: Karel Zak Date: Thu Jun 26 14:45:02 2014 +0200 fallocate: use O_CREAT only for the default behavior Reported-by: Bernhard Voelker Signed-off-by: Karel Zak sys-utils/fallocate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 38a5440c95acc43048510841d107508a836e602c Author: Bernhard Voelker Date: Thu Jun 26 14:14:01 2014 +0200 fallocate: fix check of number of arguments Signed-off-by: Bernhard Voelker sys-utils/fallocate.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit 14c9b680965eede7e95aa8b5934be0b686685c27 Author: Pádraig Brady Date: Thu Jun 26 13:05:16 2014 +0200 fallocate: clarify usage() Signed-off-by: Karel Zak sys-utils/fallocate.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) commit b7f3f147f24f377c63c80f3aca38e2881774fa08 Author: Karel Zak Date: Thu Jun 26 12:38:04 2014 +0200 fallocate: use err_exclusive_options(), cleanup getopt_long() stuff Signed-off-by: Karel Zak sys-utils/fallocate.1 | 10 +++++++--- sys-utils/fallocate.c | 44 ++++++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 23 deletions(-) commit 634a4cf1b24a9e6603fb3f5a4616a0158077f234 Author: Karel Zak Date: Thu Jun 26 12:01:59 2014 +0200 fallocate: make man page readable for humans Well, let's copy & past from fallocate(2) syscall man page rather than try to be creative with another description for the flags. Reported-by: Bernhard Voelker Signed-off-by: Karel Zak sys-utils/fallocate.1 | 69 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 28 deletions(-) commit dac1cb536b78e0d004d5735c895c564bd3fd2b25 Author: Karel Zak Date: Thu Jun 26 12:01:13 2014 +0200 fallocate: fix FALLOC_FL_ZERO_RANGE flag check Reported-by: Bernhard Voelker Signed-off-by: Karel Zak sys-utils/fallocate.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 6d4774b0d4110304a492df29f543fe480af66389 Author: Karel Zak Date: Wed Jun 25 14:04:20 2014 +0200 docs: add note about lsblk Signed-off-by: Karel Zak Documentation/TODO | 8 ++++++++ 1 file changed, 8 insertions(+) commit b8446f75d862c1f5e548e912ff143fe37a8d0b3f Author: Karel Zak Date: Wed Jun 25 13:55:56 2014 +0200 bash-completion: update fallocate, fstrim and lsblk Signed-off-by: Karel Zak bash-completion/fallocate | 9 ++++++++- bash-completion/fstrim | 8 +++++++- bash-completion/lsblk | 25 +++++++++++++++++-------- 3 files changed, 32 insertions(+), 10 deletions(-) commit 077698f5d6caaf93ef272efa57ba90555577576f Author: Karel Zak Date: Wed Jun 25 13:44:08 2014 +0200 bash-completion: update cfdisk Signed-off-by: Karel Zak bash-completion/cfdisk | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) commit 675821f4bd1fd46d3d375f4ca057c65cb51eebc3 Author: Karel Zak Date: Wed Jun 25 13:41:27 2014 +0200 bash-completion: update fdisk Signed-off-by: Karel Zak bash-completion/fdisk | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) commit e3a4aaa7d3ce308172aa2c0cf2e241d310c762e3 Author: Karel Zak Date: Wed Jun 25 13:21:35 2014 +0200 fdisk: add long options, cleanup man page and usage() Signed-off-by: Karel Zak disk-utils/fdisk.8 | 55 ++++++++++++++++---------------- disk-utils/fdisk.c | 94 +++++++++++++++++++++++++++++++++++------------------- 2 files changed, 88 insertions(+), 61 deletions(-) commit 505dedfec4f821e06e3c36c616563603564ff8e1 Author: Karel Zak Date: Wed Jun 25 13:21:15 2014 +0200 docs: fix minor things in man-page howto Signed-off-by: Karel Zak Documentation/howto-man-page.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 425ae8f50c315d75f539da65afe7ef4aadf51a86 Author: Karel Zak Date: Wed Jun 25 11:39:30 2014 +0200 docs: add fdisk mac support to TODO file Signed-off-by: Karel Zak Documentation/TODO | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit cbccd7a4f8ffcded136e83fb7c3aeedc393d312d Author: David Shea Date: Mon Jun 23 13:41:48 2014 -0400 libblkid: correct the return values in squashfs probe Returning -1 can cause squashfs v3 detection to make v4 detection fail. Signed-off-by: Karel Zak libblkid/src/superblocks/squashfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 11712b6667225ef6fa6b64c1fe48ed5b501ad72e Author: Karel Zak Date: Tue Jun 24 10:32:25 2014 +0200 libfdisk: (dos) count fisrt usable LBA to total number of used sectors The check() function counts number of used sectors, but it counts only partitions. This is mistake, the area before the first partition is also "used" place (boot loaders or we have to align the first partition to disk I/O limits, etc). Signed-off-by: Karel Zak libfdisk/src/dos.c | 3 +++ 1 file changed, 3 insertions(+) commit 63fb717d8c71c6ccc7dc9cb1e97bff5fb28733fd Author: Karel Zak Date: Tue Jun 24 09:40:56 2014 +0200 libfdisk: (dos) use check() for dos-comaptible mode only Signed-off-by: Karel Zak libfdisk/src/dos.c | 3 +++ 1 file changed, 3 insertions(+) commit 9bb8caff87c2ae1ea22068176d3375c1cc2cb76d Author: Thorsten Wilmer Date: Tue Jun 24 09:38:30 2014 +0200 libfdisk: (dos) calculation of total size based on CHS in check function Many people report a problem with the message if (cylinders <= 1024 && start != total) fprintf(stderr, _("Partition %d: previous sectors %d disagrees with " "total %d\n"), n, start, total); This message comes from the fact that the previous code caluclates the total number of sectors in the wrong way. The formula should be total = (real_c * heads + h) * sectors + real_s; As a Cylinder consists of some heads * sectors A Head consists of some sectors and finally sectors are the smallest unit Signed-off-by: Karel Zak libfdisk/src/dos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b1f03df7983975919b2d2f6eaa3175212ce61bee Author: Karel Zak Date: Mon Jun 23 12:42:33 2014 +0200 libmount: special treatment for auto in fstype pattern Let's support mount -t ext2,auto /dev/sde /media/stick Reported-by: Andreas Henriksson Addresses: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=506695 Signed-off-by: Karel Zak libmount/src/context.c | 64 +++++++++++++++++++++++++++----------------- libmount/src/context_mount.c | 24 ++++++++++++++--- libmount/src/mountP.h | 1 + 3 files changed, 61 insertions(+), 28 deletions(-) commit 033effcacd546952698e18a7eb56c1ce8b167cbe Author: peppe Date: Sun Jun 22 14:23:25 2014 +0200 hwclock: sometimes one day lasts 23 hours. If less than 23 hours have passed since the last calibration, hwclock says "Not adjusting drift factor because it has been less than a day since the last calibration.", but in fact compares to 23 hours, not 24. This was originally reported at: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=689534 Signed-off-by: Andreas Henriksson sys-utils/hwclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cabce4ea7191d4e97d05eda1cb9f95bf4d860533 Author: Karel Zak Date: Mon Jun 23 11:41:31 2014 +0200 script: clean up code to genenrate Star/Done messages Signed-off-by: Karel Zak term-utils/script.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit dc47cfee48373b3d3869e07ec9bd53a7a77d290e Author: Andreas Henriksson Date: Sun Jun 22 03:12:44 2014 +0200 script: silence the done message on --quiet as well Apparently James Hunts patch (which he provided a long time ago) is no longer covering it all. This followup patch also silences the "Script done ..." message when --quiet is used. Signed-off-by: Andreas Henriksson term-utils/script.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 1474c09ea86cdded54187d4157536172090139a4 Author: James Hunt Date: Sun Jun 22 01:03:04 2014 +0200 script: --quiet option is not quiet. Specifying 'script --quiet ...' still produces the 'Script started' message in the typescript file. The --quiet option implies that the script program should not log any of its output to the typescript file. Originally reported at: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693966 Signed-off-by: Andreas Henriksson term-utils/script.1 | 3 ++- term-utils/script.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) commit d121efdb6e7bfe57d91d7ac46c3a3e13e9506584 Author: Karel Zak Date: Fri Jun 20 12:17:53 2014 +0200 cfdisk: add --zero command line option The option has been supported by previous versions, we can easily support it too. Signed-off-by: Karel Zak disk-utils/cfdisk.8 | 4 ++++ disk-utils/cfdisk.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) commit dd626abdbeac4ce15dbe57c8d92702ac1a64d456 Author: Karel Zak Date: Fri Jun 20 12:07:30 2014 +0200 cfdisk: don't offer BSD BSD is nested within DOS partition, so for disk without any partition table it does not make any sense to offer BSD label. Signed-off-by: Karel Zak disk-utils/cfdisk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 6da288af2ebfd9ad59136f1346137f7f11862a88 Merge: 88e0f3d f0fe8ab Author: Karel Zak Date: Thu Jun 19 11:52:27 2014 +0200 Merge branch 'master' of https://github.com/nazarov-yuriy/util-linux commit 88e0f3df66db6767d57894d05fd9fa1c15406a98 Author: Samuel Thibault Date: Thu Jun 19 10:35:23 2014 +0200 build-sys: fixes for non-Linux systems Signed-off-by: Karel Zak configure.ac | 1 + lib/boottime.c | 6 ++++++ login-utils/sulogin.c | 7 ++++++- term-utils/agetty.c | 14 +++++++++++++- 4 files changed, 26 insertions(+), 2 deletions(-) commit 2ad2196349e25d3af4beea2bfd444f85b987f9da Author: Karel Zak Date: Thu Jun 19 10:18:46 2014 +0200 build-sys: support ./configure ADJTIME_PATH= .. to override the default /etc/adjtime path. Reported-by: Bruce Dubbs Signed-off-by: Karel Zak Makefile.am | 1 + configure.ac | 6 + include/pathnames.h | 4 + sys-utils/.gitignore | 2 + sys-utils/Makemodule.am | 2 + sys-utils/hwclock.8 | 657 ------------------------------------------------ sys-utils/hwclock.8.in | 657 ++++++++++++++++++++++++++++++++++++++++++++++++ sys-utils/rtcwake.8 | 155 ------------ sys-utils/rtcwake.8.in | 157 ++++++++++++ 9 files changed, 829 insertions(+), 812 deletions(-) commit f0fe8ab50df992e2f0a9e8c49b2c43d161880d07 Author: Yuriy Nazarov Date: Thu Jun 19 03:12:22 2014 +0400 lib/loopdev.c: reset errno before strtol() call Fixed unsuccessful attempt to find unused loop devices if 0-7 devices already used and /dev/loop directory exists. lib/loopdev.c | 1 + 1 file changed, 1 insertion(+) commit ae2f2f5617752dee0c83e97785c189941c5f5d0a Author: Karel Zak Date: Wed Jun 18 15:42:09 2014 +0200 build-sys: add libsmartcols to ko-release-gen script Signed-off-by: Karel Zak tools/ko-release-gen | 1 + 1 file changed, 1 insertion(+)