]> git.ipfire.org Git - thirdparty/util-linux.git/log
thirdparty/util-linux.git
3 years agolibmount: fix compilation
Karel Zak [Wed, 8 Jun 2022 08:44:03 +0000 (10:44 +0200)] 
libmount: fix compilation

Fixes: https://github.com/util-linux/util-linux/issues/1711
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolsblk: fix memory leak and unnecessary allocation
Karel Zak [Tue, 7 Jun 2022 07:57:01 +0000 (09:57 +0200)] 
lsblk: fix memory leak and unnecessary allocation

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolslogins: fix free(): invalid pointer
Karel Zak [Tue, 7 Jun 2022 07:46:54 +0000 (09:46 +0200)] 
lslogins: fix free(): invalid pointer

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolslogins: improve prefixes interpretation
Karel Zak [Tue, 7 Jun 2022 07:11:56 +0000 (09:11 +0200)] 
lslogins: improve prefixes interpretation

It seems that for example 'passwd --lock' uses two exclamation marks
in password  field. It seems better to assume arbitrary number of '!'
and '*' prefixes.

The patch also makes description of the PWD-EMPTY output field more
explicit.

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2093166
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agozramctl: fix compiler warning [-Werror=maybe-uninitialized]
Karel Zak [Mon, 6 Jun 2022 14:19:16 +0000 (16:19 +0200)] 
zramctl: fix compiler warning [-Werror=maybe-uninitialized]

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolsfd: fix compiler warning [-Werror=maybe-uninitialized]
Karel Zak [Mon, 6 Jun 2022 14:15:43 +0000 (16:15 +0200)] 
lsfd: fix compiler warning [-Werror=maybe-uninitialized]

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agoirqtop: fix compiler warning [-Werror=format-truncation=]
Karel Zak [Mon, 6 Jun 2022 14:14:30 +0000 (16:14 +0200)] 
irqtop: fix compiler warning [-Werror=format-truncation=]

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolib/logindefs: fix compiler warning [-Werror=format-truncation=]
Karel Zak [Mon, 6 Jun 2022 14:14:14 +0000 (16:14 +0200)] 
lib/logindefs: fix compiler warning [-Werror=format-truncation=]

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolsblk: simplify code by ul_path_count_dirents()
Karel Zak [Mon, 6 Jun 2022 10:36:13 +0000 (12:36 +0200)] 
lsblk: simplify code by ul_path_count_dirents()

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolsblk: enable 'MQ' for NVMe/virtio by default
zhenwei pi [Fri, 3 Jun 2022 12:24:02 +0000 (20:24 +0800)] 
lsblk: enable 'MQ' for NVMe/virtio by default

NVMe/virtio devices typically has MQ feature, enable this column by
default for option '--nvme/--virtio'.

Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
3 years agolsblk: introduce 'MQ' column
zhenwei pi [Fri, 3 Jun 2022 12:24:01 +0000 (20:24 +0800)] 
lsblk: introduce 'MQ' column

Typically a modern block device supports mutil queues feature, count
queues by walking '$sysfs/mq' directory. If no '$sysfs/mq' exists, it
is a legacy single queue.

~# lsblk --nvme -o NAME,TYPE,MODEL,TRAN,RQ-SIZE,MQ
NAME    TYPE MODEL                      TRAN   RQ-SIZE  MQ
nvme0n1 disk INTEL SSDPF2KX038TZ        nvme      1023 135
nvme3n1 disk INTEL SSDPE2KX020T8        nvme      1023 128
nvme1n1 disk SAMSUNG MZQL23T8HCLS-00A07 nvme      1023 129
nvme2n2 disk RP2A03T8RK004LX            nvme      1023  64
nvme2n3 disk RP2A03T8RK004LX            nvme      1023  64

Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
3 years agolsblk: add -v/--virtio
zhenwei pi [Fri, 3 Jun 2022 12:24:00 +0000 (20:24 +0800)] 
lsblk: add -v/--virtio

Add -v/--virtio to filter the virtio block devices.

Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
3 years agolsblk: support virtio block
zhenwei pi [Fri, 3 Jun 2022 12:23:59 +0000 (20:23 +0800)] 
lsblk: support virtio block

virtio blk is quite popular in the virtual machines, support 'TRAN'
column for a virtio block device.

Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
3 years agolsblk: add -N/--nvme
zhenwei pi [Fri, 3 Jun 2022 12:23:58 +0000 (20:23 +0800)] 
lsblk: add -N/--nvme

Add -N/--nvme to filter NVMe device only, NVMe usually has a larger
I/O depth, also show COL_RQ_SIZE by default.

Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
3 years agotests: (pipesz) use helper to get pagesize
Karel Zak [Mon, 6 Jun 2022 10:23:36 +0000 (12:23 +0200)] 
tests: (pipesz) use helper to get pagesize

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agopipesz: use native PAGE_SIZE in tests
Nathan Sharp [Sat, 4 Jun 2022 02:00:22 +0000 (20:00 -0600)] 
pipesz: use native PAGE_SIZE in tests

Reported-by: Anatoly Pugachev <matorola@gmail.com>
Signed-off-by: Nathan Sharp <nwsharp@live.com>
3 years agolibblkid: minor changes to coding style
Karel Zak [Mon, 6 Jun 2022 10:14:10 +0000 (12:14 +0200)] 
libblkid: minor changes to coding style

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agoMerge branch 'add/btrfs-ext-fslastblock' of https://github.com/alberand/util-linux
Karel Zak [Mon, 6 Jun 2022 10:10:45 +0000 (12:10 +0200)] 
Merge branch 'add/btrfs-ext-fslastblock' of https://github.com/alberand/util-linux

* 'add/btrfs-ext-fslastblock' of https://github.com/alberand/util-linux:
  libblkid: add FSSIZE implementation for btrfs and ext

3 years agocolumn: add --table-maxout
Karel Zak [Mon, 6 Jun 2022 09:41:35 +0000 (11:41 +0200)] 
column: add --table-maxout

Add option to fill all available space.

Fizes: https://github.com/util-linux/util-linux/issues/1700
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agouuidd: remove also PrivateNetwork=yes from systemd service
Karel Zak [Fri, 3 Jun 2022 07:07:09 +0000 (09:07 +0200)] 
uuidd: remove also PrivateNetwork=yes from systemd service

Fixes: https://github.com/util-linux/util-linux/issues/1704
References: 304b4dc4936b115ca33af5325c3b04d0997c1353
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agouuidd: allow AF_INET in systemd service
Karel Zak [Thu, 2 Jun 2022 14:55:49 +0000 (16:55 +0200)] 
uuidd: allow AF_INET in systemd service

libuuid uses

socket(AF_INET, SOCK_DGRAM, IPPROTO_IP)

to get MAC address for time based UUIDs, but there is

RestrictAddressFamilies=AF_UNIX

in uuidd service file ...

Fixes: https://github.com/util-linux/util-linux/issues/1704
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolibblkid: (hfs) fix make sure buffer is large enough
Karel Zak [Thu, 2 Jun 2022 14:02:54 +0000 (16:02 +0200)] 
libblkid: (hfs) fix make sure buffer is large enough

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolibblkid: (hfs) fix label use [fuzzing]
Karel Zak [Thu, 2 Jun 2022 14:02:54 +0000 (16:02 +0200)] 
libblkid: (hfs) fix label use [fuzzing]

Reported-by: Thibault Guittet <tguittet@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolibblkid: (bsd) fix buffer pointer use [fuzzing]
Karel Zak [Thu, 2 Jun 2022 14:02:54 +0000 (16:02 +0200)] 
libblkid: (bsd) fix buffer pointer use [fuzzing]

Reported-by: Thibault Guittet <tguittet@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolibblkid: (mac) make sure block size is large enough [fuzzing]
Karel Zak [Thu, 2 Jun 2022 14:02:54 +0000 (16:02 +0200)] 
libblkid: (mac) make sure block size is large enough [fuzzing]

Reported-by: Thibault Guittet <tguittet@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolibblkid: (probe) fix size and offset overflows [fuzzing]
Karel Zak [Thu, 2 Jun 2022 14:02:54 +0000 (16:02 +0200)] 
libblkid: (probe) fix size and offset overflows [fuzzing]

Reported-by: Thibault Guittet <tguittet@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolibblkid: add FSSIZE implementation for btrfs and ext
Andrey Albershteyn [Fri, 27 May 2022 11:57:14 +0000 (13:57 +0200)] 
libblkid: add FSSIZE implementation for btrfs and ext

The implementation does not take into account complete metadata
overhead. The BTRFS one doesn't consider redundant data in RAID
configuration. The ext one doesn't take into account file system
overhead.

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
3 years agoMerge branch 'fix/xfs-block-size' of https://github.com/alberand/util-linux
Karel Zak [Mon, 30 May 2022 10:07:16 +0000 (12:07 +0200)] 
Merge branch 'fix/xfs-block-size' of https://github.com/alberand/util-linux

* 'fix/xfs-block-size' of https://github.com/alberand/util-linux:
  libblkid: update documentation of BLOCK_SIZE tag
  libblkid: add FSBLOCKSIZE tag

3 years agopipesz: correct manpage issues
Nathan Sharp [Fri, 27 May 2022 02:59:44 +0000 (20:59 -0600)] 
pipesz: correct manpage issues

pipesz's manual page reflects an older version which examined all file
descriptors when --get was specified without --fd or --file.

This patch corrects this, fixes a spelling issue, and makes some
formatting tweaks to improve the clarity of some sections.

Signed-off-by: Nathan Sharp <nwsharp@live.com>
3 years agolibblkid: update documentation of BLOCK_SIZE tag
Andrey Albershteyn [Fri, 27 May 2022 10:56:27 +0000 (12:56 +0200)] 
libblkid: update documentation of BLOCK_SIZE tag

The name BLOCK_SIZE is unfortunate. This tag doesn't represent
commonly used file system block size but minimal block size
accessible by file system (sector size).

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
3 years agolibblkid: add FSBLOCKSIZE tag
Andrey Albershteyn [Fri, 27 May 2022 10:05:32 +0000 (12:05 +0200)] 
libblkid: add FSBLOCKSIZE tag

The FSBLOCKSIZE tag exposes file system block size in contrast to
the BLOCK_SIZE (unfortunate name) which returns minimal accessible
block size (sector size).

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
3 years agoAdd pipesz.1.adoc to po4a configuration
Mario Blättermann [Thu, 26 May 2022 13:04:19 +0000 (15:04 +0200)] 
Add pipesz.1.adoc to po4a configuration

3 years agoloopdev: set block_size when using LOOP_CONFIGURE
Hideki EIRAKU [Wed, 25 May 2022 03:23:16 +0000 (12:23 +0900)] 
loopdev: set block_size when using LOOP_CONFIGURE

LOOP_CONFIGURE ioctl was introduced by commit
d5fd456c88aba4fcf77d35fe38024a8d5c814686. Since the previous
implementation set partscan flag but did not set block_size with the
LOOP_CONFIGURE ioctl, an issue fixed by commit
422f0e9f206a145c59a71333dad20d38cbbfc0c4 was reappeared. Setting
block_size in the LOOP_CONFIGURE ioctl parameter fixes the issue.

Signed-off-by: Hideki EIRAKU <hdk@igel.co.jp>
3 years agoMerge branch 'taskset-mistake' of https://github.com/csbo98/util-linux
Karel Zak [Thu, 26 May 2022 07:49:29 +0000 (09:49 +0200)] 
Merge branch 'taskset-mistake' of https://github.com/csbo98/util-linux

* 'taskset-mistake' of https://github.com/csbo98/util-linux:
  Maybe there is a little mistake in do_taskset() function in taskset.c. In the first call of sched_getaffinity(), if the call is failed we should use err_affinity(ts->pid, 0) other than err_affinity(ts->pid, 1).

3 years agoMaybe there is a little mistake in do_taskset() function in taskset.c.
csbo98 [Sun, 22 May 2022 06:47:13 +0000 (14:47 +0800)] 
Maybe there is a little mistake in do_taskset() function in taskset.c.
In the first call of sched_getaffinity(), if the call is failed we should
use err_affinity(ts->pid, 0) other than err_affinity(ts->pid, 1).

3 years agominor: clarity in fstrim.timer
Sebastian Pucilowski [Fri, 20 May 2022 06:47:12 +0000 (16:47 +1000)] 
minor: clarity in fstrim.timer

3 years agopipesz: fix dead code [coverity scan]
Karel Zak [Thu, 19 May 2022 07:48:18 +0000 (09:48 +0200)] 
pipesz: fix dead code [coverity scan]

309                     if (!opt_quiet && n_opt_size > 1)
>>>     CID 378501:  Control flow issues  (DEADCODE)
>>>     Execution cannot reach this statement: "warnx(dcgettext(NULL, "usin...".
310                             warnx(_("using last specified size"));

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agopipesz: fix minor coding style issues
Karel Zak [Wed, 18 May 2022 08:41:00 +0000 (10:41 +0200)] 
pipesz: fix minor coding style issues

* remove tailing white spaces
* use {} for while()
* fix --help indention

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agopipesz: add bash-completion script
Nathan Sharp [Tue, 12 Apr 2022 04:59:30 +0000 (22:59 -0600)] 
pipesz: add bash-completion script

Signed-off-by: Nathan Sharp <nwsharp@live.com>
3 years agopipesz: add manpage
Nathan Sharp [Tue, 12 Apr 2022 04:59:29 +0000 (22:59 -0600)] 
pipesz: add manpage

Signed-off-by: Nathan Sharp <nwsharp@live.com>
3 years agopipesz: add tests
Nathan Sharp [Tue, 12 Apr 2022 04:59:28 +0000 (22:59 -0600)] 
pipesz: add tests

Signed-off-by: Nathan Sharp <nwsharp@live.com>
3 years agopipesz: add the pipesz utility
Nathan Sharp [Tue, 12 Apr 2022 04:59:27 +0000 (22:59 -0600)] 
pipesz: add the pipesz utility

pipesz is a utility to examine and adjust the size of pipe buffers.

It uses fctnl F_GETPIPE_SZ and F_SETPIPE_SZ to examine and resize
these buffers. This functionality is unique to Linux and was added in
version 2.6.35. Minor bugfixes were made in 4.9, but these do not
obviate the use of pipesz prior to that release.

Signed-off-by: Nathan Sharp <nwsharp@live.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agoMerge branch 'issue-1686' of https://github.com/sshambar/util-linux
Karel Zak [Wed, 18 May 2022 07:30:38 +0000 (09:30 +0200)] 
Merge branch 'issue-1686' of https://github.com/sshambar/util-linux

* 'issue-1686' of https://github.com/sshambar/util-linux:
  fstrim: Remove all skipped entries before de-duplication

3 years agoMerge branch 'patch-1' of https://github.com/neheb/util-linux
Karel Zak [Wed, 18 May 2022 07:24:04 +0000 (09:24 +0200)] 
Merge branch 'patch-1' of https://github.com/neheb/util-linux

* 'patch-1' of https://github.com/neheb/util-linux:
  meson: don't build po if no gettext

3 years agoMerge branch '1' of https://github.com/neheb/util-linux
Karel Zak [Wed, 18 May 2022 07:23:48 +0000 (09:23 +0200)] 
Merge branch '1' of https://github.com/neheb/util-linux

* '1' of https://github.com/neheb/util-linux:
  replace prefix with args
  meson: fix tzname check and simplify strsignal

3 years agomeson: don't build po if no gettext
Rosen Penev [Wed, 18 May 2022 00:04:47 +0000 (17:04 -0700)] 
meson: don't build po if no gettext

3 years agoreplace prefix with args
Rosen Penev [Mon, 16 May 2022 03:36:39 +0000 (20:36 -0700)] 
replace prefix with args

meson reference says in case of _GNU_SOURCE that args should be used.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agomeson: fix tzname check and simplify strsignal
Rosen Penev [Mon, 16 May 2022 03:24:21 +0000 (20:24 -0700)] 
meson: fix tzname check and simplify strsignal

The former needs _GNU_SOURCE under musl. The latter can just use
has_function.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agofstrim: Remove all skipped entries before de-duplication
Scott Shambarger [Thu, 12 May 2022 23:27:26 +0000 (16:27 -0700)] 
fstrim: Remove all skipped entries before de-duplication

When processing fstab entries, de-duplication is performed based on the
source before all tests on the target have been checked, resulting in
some entries being skipped when a removed duplicate with a different
target would not have been.

The fix is to move all the target checks before the source
de-duplication.

Addresses: #1686
Signed-off-by: Scott Shambarger <devel@shambarger.net>
3 years agolosetup: Fix typo for the --sector-size docs
Alberto Ruiz [Thu, 12 May 2022 21:35:21 +0000 (23:35 +0200)] 
losetup: Fix typo for the --sector-size docs

3 years agoMerge branch 'hardlink-docs' of https://github.com/ferdnyc/util-linux
Karel Zak [Wed, 11 May 2022 08:21:34 +0000 (10:21 +0200)] 
Merge branch 'hardlink-docs' of https://github.com/ferdnyc/util-linux

* 'hardlink-docs' of https://github.com/ferdnyc/util-linux:
  hardlink: Fix man page docs for '-v/--verbose'
  hardlink: Wrap -b to 80 cols, in --help
  hardlink: Move reflink options in manpage
  hardlink: Move -c option in --help
  hardlink: Document '-c' option in manpage

3 years agofix time_t format
Rosen Penev [Tue, 3 May 2022 00:53:07 +0000 (17:53 -0700)] 
fix time_t format

Use musl's define to test for 64-bit time_t.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agofix various formats
Rosen Penev [Tue, 3 May 2022 00:43:32 +0000 (17:43 -0700)] 
fix various formats

Found with -Wformat.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agohardlink: Fix man page docs for '-v/--verbose'
FeRD (Frank Dana) [Mon, 9 May 2022 21:17:57 +0000 (17:17 -0400)] 
hardlink: Fix man page docs for '-v/--verbose'

Signed-off-by: FeRD (Frank Dana) <ferdnyc@gmail.com>
3 years agohardlink: Wrap -b to 80 cols, in --help
FeRD (Frank Dana) [Mon, 9 May 2022 21:14:48 +0000 (17:14 -0400)] 
hardlink: Wrap -b to 80 cols, in --help

Signed-off-by: FeRD (Frank Dana) <ferdnyc@gmail.com>
3 years agohardlink: Move reflink options in manpage
FeRD (Frank Dana) [Mon, 9 May 2022 11:32:44 +0000 (07:32 -0400)] 
hardlink: Move reflink options in manpage

The documentation for the --reflink and --skip-reflink options
felt sort of shoe-horned into the rest of the options, in the
man page. Reorder to match where they appear in the --help output.

Signed-off-by: FeRD (Frank Dana) <ferdnyc@gmail.com>
3 years agohardlink: Move -c option in --help
FeRD (Frank Dana) [Mon, 9 May 2022 11:31:13 +0000 (07:31 -0400)] 
hardlink: Move -c option in --help

The new placement mirrors its position in the manpage, and
keeps it grouped with the individual flags for which it
acts as a shorthand.

Signed-off-by: FeRD (Frank Dana) <ferdnyc@gmail.com>
3 years agohardlink: Document '-c' option in manpage
FeRD (Frank Dana) [Mon, 9 May 2022 11:20:26 +0000 (07:20 -0400)] 
hardlink: Document '-c' option in manpage

Signed-off-by: FeRD (Frank Dana) <ferdnyc@gmail.com>
3 years agofstrim: check for ENOSYS when using --quiet-unsupported
Narthorn [Sat, 7 May 2022 05:43:02 +0000 (07:43 +0200)] 
fstrim: check for ENOSYS when using --quiet-unsupported

Some filesystems like bindfs report ENOSYS (Function not implemented)
for the trim ioctl, which should be caught by --quiet-unsupported.

3 years agoMerge branch 'meson-fixups' of https://github.com/eli-schwartz/util-linux
Karel Zak [Thu, 5 May 2022 09:12:23 +0000 (11:12 +0200)] 
Merge branch 'meson-fixups' of https://github.com/eli-schwartz/util-linux

* 'meson-fixups' of https://github.com/eli-schwartz/util-linux:
  meson: fix error in processing version for pc files
  meson: get the project version from the version-gen script

3 years agoMerge branch 'master' of https://github.com/mariobl/util-linux
Karel Zak [Thu, 5 May 2022 09:10:46 +0000 (11:10 +0200)] 
Merge branch 'master' of https://github.com/mariobl/util-linux

* 'master' of https://github.com/mariobl/util-linux:
  Add blkpr.8.adoc to po4a configuration

3 years agoMerge branch 'master' of https://github.com/jlinton/util-linux
Karel Zak [Thu, 5 May 2022 09:09:05 +0000 (11:09 +0200)] 
Merge branch 'master' of https://github.com/jlinton/util-linux

* 'master' of https://github.com/jlinton/util-linux:
  lscpu: Add Snapdragon parts

3 years agomeson: fix error in processing version for pc files
Eli Schwartz [Thu, 5 May 2022 04:16:15 +0000 (00:16 -0400)] 
meson: fix error in processing version for pc files

This awk command was copied verbatim from configure.ac, which included
non-awk syntax because configure.ac cannot contain [ literals.

Rewrite these autoconf quadrigraphs as their actual values, for meson.

Fixes always setting the micro version to "0".

3 years agomeson: get the project version from the version-gen script
Eli Schwartz [Thu, 5 May 2022 03:52:31 +0000 (23:52 -0400)] 
meson: get the project version from the version-gen script

This matches autotools and ensures that the version number is actually
reliable.

3 years agoAdd blkpr.8.adoc to po4a configuration
Mario Blättermann [Wed, 4 May 2022 18:27:24 +0000 (20:27 +0200)] 
Add blkpr.8.adoc to po4a configuration

3 years agolscpu: Add Snapdragon parts
Jeremy Linton [Wed, 4 May 2022 17:30:34 +0000 (12:30 -0500)] 
lscpu: Add Snapdragon parts

QC updated the kernel cputype.h to include the Kyro 4xx and 3xx Silver
part numbers's. Lets sync that commit and naming.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
3 years agolibblkid: merge FS* flags into one FSINFO
Andrey Albershteyn [Mon, 2 May 2022 15:08:33 +0000 (17:08 +0200)] 
libblkid: merge FS* flags into one FSINFO

Put BLOCK_SIZE, FSSIZE and FSLASTBLOCK tags under one FSINFO flag.
These, and probably future ones, are read directly from the
superblock (with minor post-processing). These properties are
combined under one flag to escape adding a flag per superblock
member.

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
3 years agolibmount: fix and improve utab update on MS_MOVE
Karel Zak [Wed, 4 May 2022 10:13:08 +0000 (12:13 +0200)] 
libmount: fix and improve utab update on MS_MOVE

* avoid double '//'

* don't update /fooxxx when /foo update requested (make sure that
  startswith() returns path terminated by '/')

* canonicalize only once the new path -- all in utab/mtab is already
  canonicalized, so after MS_MOVE we need to care about the new path
  only

* use asprintf() rather than strcpy() and strcat(), don't compose a
  new path from prefix and subdir when replace entire path

Addresses: https://github.com/util-linux/util-linux/pull/1660
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agoMerge branch 'fix-move-with-sub-mounted-trees' of https://github.com/fbuihuu/util...
Karel Zak [Wed, 4 May 2022 09:22:58 +0000 (11:22 +0200)] 
Merge branch 'fix-move-with-sub-mounted-trees' of https://github.com/fbuihuu/util-linux

* 'fix-move-with-sub-mounted-trees' of https://github.com/fbuihuu/util-linux:
  libmount: when moving a mount point, all sub mount entries in utab should also be updated

3 years agomeson: make libcap-ng dependent on setpriv
Rosen Penev [Mon, 2 May 2022 23:18:33 +0000 (16:18 -0700)] 
meson: make libcap-ng dependent on setpriv

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agomeson: get rid of get_pkgconfig_variable
Rosen Penev [Mon, 2 May 2022 23:30:26 +0000 (16:30 -0700)] 
meson: get rid of get_pkgconfig_variable

deprecated in 0.56

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agoMerge branch 'add/fslastblock' of https://github.com/alberand/util-linux
Karel Zak [Mon, 2 May 2022 13:45:30 +0000 (15:45 +0200)] 
Merge branch 'add/fslastblock' of https://github.com/alberand/util-linux

* 'add/fslastblock' of https://github.com/alberand/util-linux:
  blkid: add tests for FSLASTBLOCK tag
  blkid: add image for btrfs testing
  libblkid: add FSLASTBLOCK implementation for xfs, ext and btrfs
  libblkid: add FSLASTBLOCK field interface showing area occupied by fs

3 years agoagetty: fix prompt
Karel Zak [Mon, 2 May 2022 13:40:23 +0000 (15:40 +0200)] 
agetty: fix prompt

Reported-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agologger: make sure structured data are escaped
Karel Zak [Mon, 2 May 2022 13:30:26 +0000 (15:30 +0200)] 
logger: make sure structured data are escaped

For the option --sd-param all formatting chars (" \ and ]) has to be
escaped by \. This patch also allow escape [ to make it more user
friendly.

For example

$ logger --rfc5424 --sd-id zoo@123 --sd-param 'foo="b\"A\"r"' --no-act --stderr "this is message"
<13>1 2022-05-02T15:35:00.342141+02:00 ws.net.home kzak - - [timeQuality tzKnown="1" isSynced="1" syncAccuracy="45291"][zoo@123 foo="b\"A\"r"] this is message

Reported-by: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolib/strutils: add ul_strchr_escaped()
Karel Zak [Mon, 2 May 2022 13:07:42 +0000 (15:07 +0200)] 
lib/strutils: add ul_strchr_escaped()

Like strchr(), but ignores escaped chars.

Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agomore: avoid infinite loop on --squeeze
Karel Zak [Mon, 2 May 2022 10:57:13 +0000 (12:57 +0200)] 
more: avoid infinite loop on --squeeze

The command 'echo | more -s' ends in infinite loop if exit-on-EOF is
disabled (default now). We need to call more_key_command() to ask for
user's reaction.

Fixes: https://github.com/util-linux/util-linux/issues/1669
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agoMerge branch 'gpt-marvell' of https://github.com/pali/util-linux
Karel Zak [Mon, 2 May 2022 10:28:45 +0000 (12:28 +0200)] 
Merge branch 'gpt-marvell' of https://github.com/pali/util-linux

* 'gpt-marvell' of https://github.com/pali/util-linux:
  libfdisk: (gpt) Add UUID for Marvell Armada 3700 Boot partition

3 years agoMerge branch 'meson' of https://github.com/neheb/util-linux
Karel Zak [Mon, 2 May 2022 10:15:32 +0000 (12:15 +0200)] 
Merge branch 'meson' of https://github.com/neheb/util-linux

* 'meson' of https://github.com/neheb/util-linux:
  meson: make libpam optional
  meson: fix tzname check
  meson: fix isnan check
  meson: add _GNU_SOURCE for sighandler_t
  meson: fix environ search
  meson: fix cpu_set_t test
  meson: don't use run
  meson: fix compilation without systemd

3 years agoblkid: add tests for FSLASTBLOCK tag
Andrey Albershteyn [Wed, 27 Apr 2022 15:33:33 +0000 (17:33 +0200)] 
blkid: add tests for FSLASTBLOCK tag

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
3 years agoblkid: add image for btrfs testing
Andrey Albershteyn [Wed, 27 Apr 2022 15:29:27 +0000 (17:29 +0200)] 
blkid: add image for btrfs testing

The btrfs is one of the popular filesystem which is supported by
blkid. However, the image for 'low-probe' tests was missing. Add
115M BTRFS default image (mkfs.btrfs btrfs.img).

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
3 years agolibblkid: add FSLASTBLOCK implementation for xfs, ext and btrfs
Andrey Albershteyn [Wed, 27 Apr 2022 12:46:33 +0000 (14:46 +0200)] 
libblkid: add FSLASTBLOCK implementation for xfs, ext and btrfs

Implementation of FSLASTBLOCK for most common filesystems. Most of
the fs store total number of reserved blocks in superblock.

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
3 years agoMerge branch 'better-bsd-compat' of https://github.com/bsdimp/util-linux
Karel Zak [Mon, 2 May 2022 10:03:49 +0000 (12:03 +0200)] 
Merge branch 'better-bsd-compat' of https://github.com/bsdimp/util-linux

* 'better-bsd-compat' of https://github.com/bsdimp/util-linux:
  BSD: Use byteswap.h and endian.h defined macos when present

3 years agoMerge branch 'master' of https://github.com/caramelli/util-linux
Karel Zak [Mon, 2 May 2022 09:59:42 +0000 (11:59 +0200)] 
Merge branch 'master' of https://github.com/caramelli/util-linux

* 'master' of https://github.com/caramelli/util-linux:
  meson: fix when HAVE_CLOCK_GETTIME is set

3 years agoMerge branch 'safe-getenv' of https://github.com/floppym/util-linux
Karel Zak [Mon, 2 May 2022 09:43:08 +0000 (11:43 +0200)] 
Merge branch 'safe-getenv' of https://github.com/floppym/util-linux

* 'safe-getenv' of https://github.com/floppym/util-linux:
  lib: allow safe_getenv to work for non-root users

3 years agomeson: make libpam optional
Rosen Penev [Mon, 2 May 2022 03:28:39 +0000 (20:28 -0700)] 
meson: make libpam optional

libpam is only needed if 4 utilities are built

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agolibfdisk: (gpt) Add UUID for Marvell Armada 3700 Boot partition
Pali Rohár [Sat, 30 Apr 2022 10:50:46 +0000 (12:50 +0200)] 
libfdisk: (gpt) Add UUID for Marvell Armada 3700 Boot partition

This GPT UUID is used by BootROM on Marvell Armada 3700 SoC. BootROM
searches for GPT partition with this UUID on attached SATA disk and loads
bootloader from it.

Marvell Armada 3700 SoC is used e.g. on popular EspressoBIN SBC board which
has relatively solid Linux support.

Information about SATA booting and this GPT partition is currently
documented only in development version of ARM Trusted-Firmware-A
documentation:

https://trustedfirmware-a.readthedocs.io/en/latest/plat/marvell/armada/build.html

It is missing in official documentation for Armada 3720 BootROM and
therefore hard to find it.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
3 years agomeson: fix tzname check
Rosen Penev [Sat, 30 Apr 2022 02:00:53 +0000 (19:00 -0700)] 
meson: fix tzname check

tzname is not a type but a variable. sizeof only works on types.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agomeson: fix isnan check
Rosen Penev [Sat, 30 Apr 2022 01:19:53 +0000 (18:19 -0700)] 
meson: fix isnan check

musl only has isnan as a macro, not as a function. Handle the former
case.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agomeson: add _GNU_SOURCE for sighandler_t
Rosen Penev [Sat, 30 Apr 2022 01:17:52 +0000 (18:17 -0700)] 
meson: add _GNU_SOURCE for sighandler_t

musl requires it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agomeson: fix environ search
Rosen Penev [Sat, 30 Apr 2022 01:16:17 +0000 (18:16 -0700)] 
meson: fix environ search

musl has it defined in unistd.h and hidden behind _GNU_SOURCE.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agomeson: fix cpu_set_t test
Rosen Penev [Fri, 29 Apr 2022 23:55:15 +0000 (16:55 -0700)] 
meson: fix cpu_set_t test

_GNU_SOURCE is needed here.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agomeson: don't use run
Rosen Penev [Fri, 29 Apr 2022 23:56:54 +0000 (16:56 -0700)] 
meson: don't use run

Fixes cross compilation. run is not needed anyway.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agomeson: fix compilation without systemd
Rosen Penev [Fri, 29 Apr 2022 23:53:43 +0000 (16:53 -0700)] 
meson: fix compilation without systemd

systemdsystemunitdir is used elsewhere.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
3 years agoBSD: Use byteswap.h and endian.h defined macos when present
Warner Losh [Fri, 29 Apr 2022 21:29:44 +0000 (15:29 -0600)] 
BSD: Use byteswap.h and endian.h defined macos when present

Newer versions of FreeBSD will have a glibc compatible
byteswap.h. Currently, this file assumes that FreeBSD requires
bswap{16,32,64} to always be defined. This isn't the case when we're
using the byteswap.h file (which is enabled by HAVE_BYTESWAP_H
define). Assume that if byteswap.h and endian.h are present, then the
proper macros are defined.  Otherwise, assume that sys/endian.h is
present and paper over the small differences between the BSDs for this
file.

Signed-off-by: Warner Losh <imp@bsdimp.com>
3 years agomeson: fix when HAVE_CLOCK_GETTIME is set
Nicolas Caramelli [Fri, 29 Apr 2022 16:16:36 +0000 (18:16 +0200)] 
meson: fix when HAVE_CLOCK_GETTIME is set

Signed-off-by: Nicolas Caramelli <caramelli.devel@gmail.com>
3 years agolibuuid: improve cache handling
d032747 [Fri, 22 Apr 2022 08:07:46 +0000 (10:07 +0200)] 
libuuid: improve cache handling

Short running applications with a few UUID request don't need
a large cache. Therefore increment the cache size over runtime.

3 years agolsirq: improve --sort IRQ
Karel Zak [Fri, 29 Apr 2022 08:11:49 +0000 (10:11 +0200)] 
lsirq: improve --sort IRQ

IRQ column mixes numbers and text, it seems better to use strverscmp()
rather than classic strcmp().

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2078787
Signed-off-by: Karel Zak <kzak@redhat.com>
3 years agolibblkid: add FSLASTBLOCK field interface showing area occupied by fs
Andrey Albershteyn [Wed, 27 Apr 2022 11:24:56 +0000 (13:24 +0200)] 
libblkid: add FSLASTBLOCK field interface showing area occupied by fs

Add interface to let filesystem set FSLASTBLOCK which is basically
total number of fsblocks (area occupied by fs). Enable that field in
the 'superblocks' sample.

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
3 years agolib: allow safe_getenv to work for non-root users
Mike Gilbert [Tue, 26 Apr 2022 17:58:12 +0000 (13:58 -0400)] 
lib: allow safe_getenv to work for non-root users

This allows users to override settings like BLKID_FILE, as is done in
the e2fsprogs test suite.

Bug: https://bugs.gentoo.org/839825
Fixes: 035507c84b53bceb143d0923e65916cbf90979c7
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
3 years agolibblkid: fix FSSIZE docs
Karel Zak [Tue, 26 Apr 2022 08:32:05 +0000 (10:32 +0200)] 
libblkid: fix FSSIZE docs

Signed-off-by: Karel Zak <kzak@redhat.com>