summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lib/strutils: fix strnlen() fallbackKarel Zak2018-05-281-2/+2
| | | | | Addresses: https://github.com/karelzak/util-linux/issues/643 Signed-off-by: Karel Zak <kzak@redhat.com>
* Merge branch 'master' of https://github.com/pali/util-linuxKarel Zak2018-05-283-0/+20
|\ | | | | | | | | * 'master' of https://github.com/pali/util-linux: libblkid: udf: Fix reporting UDF 2.60 revision
| * libblkid: udf: Fix reporting UDF 2.60 revisionPali Rohár2018-05-253-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | According to the UDF 2.60 specification, the Minimum UDF Read Revision value shall be at most #0250 for all media with a UDF 2.60 file system. So in this case use Minimum UDF Write Revision as ID_FS_VERSION to distinguish between UDF 2.50 and UDF 2.60 discs. This commit also adds a testing Blu-Ray Recordable image with UDF revision 2.60 created by Nero which really sets Minimum UDF Read Revision to 2.50. Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
* | libblkid: (ntfs) fix cluster size checkKarel Zak2018-05-251-1/+1
|/ | | | | Addresses: https://github.com/karelzak/util-linux/issues/641 Signed-off-by: Karel Zak <kzak@redhat.com>
* libblkid: (ntfs) enlarge cluster limit to 2MBKarel Zak2018-05-251-4/+8
| | | | | | | | | | Windows 10 Creators edition has extended the ntfs cluster limit to 2MB. As a consequence blkid does not identify recent partitions with clusters beyond 65K as ntfs ones. Addresses: https://github.com/karelzak/util-linux/issues/641 Signed-off-by: Karel Zak <kzak@redhat.com> Co-Author: Jean-Pierre André <jean-pierre.andre@wanadoo.fr>
* cfdisk: fix compiler warnings, follow-up 7085f1e4 (#636)Ruediger Meier2018-05-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Seen on OSX 10.13, xcode 9.3. disk-utils/cfdisk.c:1860:45: error: format specifies type 'uintmax_t' (aka 'unsigned long') but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] DBG(UI, ul_debug("get_size (default=%ju)", *res)); ~~~ ^~~~ %llu disk-utils/cfdisk.c:267:60: note: expanded from macro 'DBG' #define DBG(m, x) __UL_DBG(cfdisk, CFDISK_DEBUG_, m, x) ^ ./include/debug.h:67:4: note: expanded from macro '__UL_DBG' x; \ ^ disk-utils/cfdisk.c:1889:25: error: incompatible pointer types passing 'uint64_t *' (aka 'unsigned long long *') to parameter of type 'uintmax_t *' (aka 'unsigned long *') [-Werror,-Wincompatible-pointer-types] rc = parse_size(buf, &user, &pwr); /* parse */ ^~~~~ ./include/strutils.h:15:51: note: passing argument to parameter 'res' here extern int parse_size(const char *str, uintmax_t *res, int *power); ^ 2 errors generated. Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
* cfdisk: use uint64_t to avoid compiler warningsKarel Zak2018-05-241-11/+11
| | | | | Reported-by: Ruediger Meier <ruediger.meier@ga-group.nl> Signed-off-by: Karel Zak <kzak@redhat.com>
* lslogins: add -o+<COLNAME> supportKarel Zak2018-05-232-17/+20
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* lslogins: add PWD-METHOD columnKarel Zak2018-05-231-1/+16
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* lslogins: fix password verificationKarel Zak2018-05-231-4/+74
| | | | | | | | | | | Let's follow the standard $id$salt$encrypted password format in verification code. The current code is useless and for example PWD-LOCK column is always FALSE. Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1581611 Signed-off-by: Karel Zak <kzak@redhat.com>
* man: Change the only argument to two for the two-fonts macrosBjarni Ingi Gislason2018-05-234-5/+5
| | | | | | | Punctuation marks have been left in the only argument of two-fonts macros, instead of being separated from it to make the second one. Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
* man: choom.1: Use the correct macro for the font change of one argumentBjarni Ingi Gislason2018-05-231-1/+1
| | | | | | | Use the correct macro "I" for one argument, instead of the two-fonts macro "IR". Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
* man: Use the correct macro for a font change of one argumentBjarni Ingi Gislason2018-05-2331-126/+126
| | | | | | | | Use the correct macro (I, B) for the font change of one argument, not those that are used for alternating two fonts, like "BR", "IR", "RB", or "RI". Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
* more: reorder global declarationsSami Kerola2018-05-231-48/+48
| | | | | | | Group include, defines and such together, and move items inbetween functions on top of the source file so that everything can be seen easily. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
* more: remove function prototypesSami Kerola2018-05-231-998/+968Star
| | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
* lsns: remove unnecessary includeKarel Zak2018-05-171-1/+0Star
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* script: fix printf format specifiersRuediger Meier2018-05-161-2/+2
| | | | | | Noticed on 32bit builds. Types changed in 0da73643. Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
* lsblk: fix notes about RAM disksKarel Zak2018-05-151-3/+3
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* lsblk: don't exclude RAM disks on --allKarel Zak2018-05-151-1/+1
| | | | | Reported-by: Milan Broz <gmazyland@gmail.com> Signed-off-by: Karel Zak <kzak@redhat.com>
* iscript: s/COLS/COLUMNS/ in start messageKarel Zak2018-05-141-1/+1
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* tests: update script done messagesKarel Zak2018-05-145-12/+12
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* script: record exit codeKarel Zak2018-05-143-20/+38
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* tests: update script headersKarel Zak2018-05-145-12/+12
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* script: add more info to script headerKarel Zak2018-05-144-11/+41
| | | | | | | | | | | | | | | | This patch introduces [...] to store extra information about terminal to the typescript header. For example: Script started on 2018-05-14 12:52:32+02:00 [TERM="xterm-256color" TTY="/dev/pts/3" COLS="190" LINES="53"] or Script started on 2018-05-14 12:54:01+02:00 [<not executed on terminal>] if stdout is not terminal. Addresses: https://github.com/karelzak/util-linux/issues/583 Signed-off-by: Karel Zak <kzak@redhat.com>
* docs: add hint about scriptKarel Zak2018-05-141-0/+2
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* script: cleanup done timestamp messageKarel Zak2018-05-141-6/+9
| | | | | | | * always save "done" timestamp to typescript (use done() for this) * use FORMAT_TIMESTAMP_MAX as buffer size Signed-off-by: Karel Zak <kzak@redhat.com>
* tests: remove debug stuff from ts/script/optionsKarel Zak2018-05-141-1/+0Star
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* script: use uint64_t for file sizesKarel Zak2018-05-141-2/+2
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* script: add the -o/--output-limit option. Fix race test.Fred Mora2018-05-146-7/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | When script is used on a host with a relatively small free disk space, it is sometimes desirable to limit the size of the captured output. This can now be enforced with the --output-limit option. The --output-limit option lets the user specify a maximum size. The program uses the size parsing from strutils and thus supports the usual multiplicative suffixes (kiB, KB, MiB, MB, etc.). After the specified number of bytes have been written to the output file, the script program will terminate the child process. Due to buffering, the size of the output file might exceed the specified limit. This limit also does not include the start and done messages. The race test was throwing an error dur to a variable being "" in some cases. Quoting the variable in the equal test took care of that test. [kzak@redhat.com: - use done() to stop script - count also timing file - remove unnamed member initialization in ctl struct - add to bash-completion] Signed-off-by: Fred Mora <fmora@datto.com> Signed-off-by: Karel Zak <kzak@redhat.com>
* bash-completion: add findmnt --real --pseudoKarel Zak2018-05-111-0/+2
| | | | Signed-off-by: Karel Zak <kzak@redhat.com>
* misc-utils/findmnt.8: add --pseudo and --real optionssluidfoe2018-05-101-1/+7
|
* misc-tools/findmnt: a few whitespace fixessluidfoe2018-05-101-3/+3
|
* misc-tools/findmnt: add --pseudo, --real filterssluidfoe2018-05-102-1/+22
|
* Merge branch 'output-all' of https://github.com/kerolasa/lelux-utiliteetitKarel Zak2018-05-1033-7/+146
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'output-all' of https://github.com/kerolasa/lelux-utiliteetit: zramctl: add --output-all option swapon: add --output-all option rfkill: add --output-all option partx: add --output-all option lsns: add --output-all option lsmem: add --output-all option lslogins: add --output-all option lslocks: add --output-all option lscpu: add --output-all option losetup: add --output-all option findmnt: add --output-all option
| * zramctl: add --output-all optionSami Kerola2018-05-033-1/+14
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| * swapon: add --output-all optionSami Kerola2018-05-033-1/+11
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| * rfkill: add --output-all optionSami Kerola2018-05-033-1/+15
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| * partx: add --output-all optionSami Kerola2018-05-033-1/+12
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| * lsns: add --output-all optionSami Kerola2018-05-033-0/+13
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| * lsmem: add --output-all optionSami Kerola2018-05-033-1/+12
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| * lslogins: add --output-all optionSami Kerola2018-05-033-0/+11
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| * lslocks: add --output-all optionSami Kerola2018-05-033-0/+13
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| * lscpu: add --output-all optionSami Kerola2018-05-033-0/+16
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| * losetup: add --output-all optionSami Kerola2018-05-033-1/+12
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| * findmnt: add --output-all optionSami Kerola2018-05-033-1/+17
| | | | | | | | Signed-off-by: Sami Kerola <kerolasa@iki.fi>
* | Merge branch 'fixes' of https://github.com/yontalcar/util-linuxKarel Zak2018-05-103-2/+4
|\ \ | | | | | | | | | | | | | | | | | | * 'fixes' of https://github.com/yontalcar/util-linux: libfdisk: fix list_del after partition reset choom: set oom_score_adj before exec fdisk: fix typo in debug string
| * | libfdisk: fix list_del after partition resetVaclav Dolezal2018-05-091-1/+1
| | | | | | | | | | | | Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
| * | choom: set oom_score_adj before execVaclav Dolezal2018-05-091-0/+2
| | | | | | | | | | | | Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
| * | fdisk: fix typo in debug stringVaclav Dolezal2018-05-091-1/+1
| |/ | | | | | | Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
* | chcpu: Fix maximal number of CPUsStanislav Brabec2018-05-101-8/+8
| | | | | | | | | | | | | | | | | | | | chcpu.c mixed maxcpus (number of cpus) and setsize (size of CPU bit mask). It effectively limits number of CPUs to 1/8 of the supported amount. Signed-off-by: Stanislav Brabec <sbrabec@suse.cz> Cc: Michael Matz <matz@suse.de> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>