Karel Zak [Tue, 1 Apr 2014 09:37:06 +0000 (11:37 +0200)]
Merge branch 'pg-manual-page-long-options' of https://github.com/jaalto/util-linux
* 'pg-manual-page-long-options' of https://github.com/jaalto/util-linux:
pg.1: Move (plus) options near (minus) option at the beginning
pg.1: Add -h, --help, -V, --version
Karel Zak [Fri, 28 Mar 2014 10:10:09 +0000 (11:10 +0100)]
Merge branch 'fix-ppc-tests' of https://github.com/rudimeier/util-linux
* 'fix-ppc-tests' of https://github.com/rudimeier/util-linux:
tests: fix last for bigendian
tests: fix utmpdump/ipv6tobin for bigendian
tests: fix utmpdump/to-binary for bigendian
tests: fix utmpdump/ipv6totxt for bigendian
tests: fix utmpdump/to-text for bigendian
tests: swaplabel needs to respect pagesize
Karel Zak [Fri, 28 Mar 2014 09:51:17 +0000 (10:51 +0100)]
Merge branch 'fix-ipcs-q-fallback' of https://github.com/rudimeier/util-linux
* 'fix-ipcs-q-fallback' of https://github.com/rudimeier/util-linux:
travis-ci: abort if make check fails
ipcs: fix memleak in ipc_*_get_info functions
ipcs: fix ipc_sem_get_info fallback case
ipcs: fix ipc_shm_get_info fallback case
ipcs: fix ipc_msg_get_info fallback case
tests: add basic test case for ipcs -m -i n
tests: add basic test case for ipcs -s -i n
tests: add basic test case for ipcs -q -i n
tests: quote generated arguments for ipcrm
ipcs: cleanup jumplabel stlyes
Karel Zak [Fri, 28 Mar 2014 09:41:44 +0000 (10:41 +0100)]
Merge branch 'fix-lscpu-cache' of https://github.com/rudimeier/util-linux
* 'fix-lscpu-cache' of https://github.com/rudimeier/util-linux:
tests: cleanup, remove unused lscpu output
tests: add lscpu dump for ppc cpu with no cache size
lscpu: cleanup, use _PATH_SYS_CPU/NODE
lscpu: don't abort if cache size is unknown
Ruediger Meier [Wed, 26 Mar 2014 21:18:17 +0000 (22:18 +0100)]
lscpu: don't abort if cache size is unknown
There are systems where the size file does not exist. Most badly even
lscpu -p would abort allthough it does not use the size:
$ lscpu -p
lscpu: error: cannot open
/sys/devices/system/cpu/cpu0/cache/index0/size: No such file or directory
This patch does not abort in this case and prints "unknown size" in
human-readable case. For examle on this qemu pcc test machine:
$ lscpu
Architecture: ppc
CPU op-mode(s): 32-bit
Byte Order: Big Endian
CPU(s): 1
On-line CPU(s) list: 0
Thread(s) per core: 1
Core(s) per socket: 1
Socket(s): 1
Model: Power Macintosh
BogoMIPS: 33.25
L1d cache: unknown size
L1i cache: unknown size
Sami Kerola [Sat, 8 Mar 2014 21:43:26 +0000 (15:43 -0600)]
mcookie: use lib/randutils
The mcookie should reuse existing code, and there is definitely no need
to prefer /dev/random for this utility. See reference for explanation
about later statement.
References: http://www.2uo.de/myths-about-urandom/ Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Karel Zak [Fri, 21 Mar 2014 14:02:29 +0000 (15:02 +0100)]
Merge branch 'master' of https://github.com/rudimeier/util-linux
* 'master' of https://github.com/rudimeier/util-linux:
tests: try hard to create swaplabel's test image
build-sys: libmount/python/__init__.py is always a dist file
tests: return error if failures file not usable
tests: write tests/failures to build- instead of srcdir
Karel Zak [Fri, 21 Mar 2014 09:59:58 +0000 (10:59 +0100)]
Merge branch 'common_debug' of https://github.com/ooprala/util-linux
* 'common_debug' of https://github.com/ooprala/util-linux:
clean up redundant macros and defines
libfdisk: use include/debug.h
libblkid: use include/debug.h
libmount: further debug.h integration
libcommon: don't mention lib versions in debug macros
libcommon: define more debugging macros
libmount: use macros from include/debug.h
libcommon: add common debugging routines
Karel Zak [Fri, 21 Mar 2014 09:30:22 +0000 (10:30 +0100)]
build-sys: gettexts 0.18 -> 0.18.2 due to MKDIR_P
The autopoint is designed to not use the latest installed bug fix
release, if you specify
AM_GNU_GETTEXT_VERSION([0.18])
in your configure.ac then it really uses 0.18, rather than also
installed 0.18.2 or 0.18.3. It means that bug fix update has no any
effect. Oh...
The AM_PROG_MKDIR_P is deprecated for years, unfortunately still used
in 0.18 gettext m4 stuff. This problem should be fixed in 0.18.2 where
is the correct AC_PROG_MKDIR_P macro.
If you do not have gettext 0.18.2 (or 0.18.3) then update.
Hannes Reinecke [Thu, 20 Mar 2014 10:03:50 +0000 (11:03 +0100)]
blkid: convert superblocks to new calling convention
With the previous patch the scanning functions were
modified to return a differentiated return code.
To correctly abort scanning when an I/O error occurs
we need to differentiate between 'error' (= -1) and
'not found' (= 1) in the probe functions.
This patch updates all superblock scanning functions
to the new calling convention.
Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Karel Zak <kzak@redhat.com>
Hannes Reinecke [Thu, 20 Mar 2014 10:03:49 +0000 (11:03 +0100)]
blkid: stop scanning on I/O error
Whenever we fail to read from a device it's pointless to
continue with probing; we should be failing immediately.
Otherwise the system will continue logging I/O errors.
This patch updates the probe functions to return the
negative error number on error and BLKID_PROBE_NONE
if not found.
Ruediger Meier [Wed, 12 Mar 2014 13:53:20 +0000 (14:53 +0100)]
ipcs: fix ipc_msg_get_info fallback case
"ipcs -q" (case id < 0) was broken since v2.22-256-g35118df if /sys
is not usable. The main issue was that the use of msqid argument did not
cleanly distinguished between "queue identifier" and "index of kernel's
internal array".
Also now the fallback case and the regular case behave more equally
regarding it's return value (introducing another counter j).
Note that the case id >= 0 now performs a slower lookup. This could be
avoided but then we would better handle both case differently like it
was before the above mentioned cleanup commit.
Sami Kerola [Sat, 8 Mar 2014 17:01:53 +0000 (11:01 -0600)]
mkswap: remove unnecessary usage output
The usage output changes too often making unnecessarily expected output
in test unstable. Besides in this case the usage ouput does not even
help user, because invalid swap target size error cannot be fixed by
specificing an option.