]> git.ipfire.org Git - thirdparty/util-linux.git/log
thirdparty/util-linux.git
4 months agoMerge branch 'master' of https://github.com/aerusso/util-linux
Karel Zak [Wed, 12 Feb 2025 09:51:46 +0000 (10:51 +0100)] 
Merge branch 'master' of https://github.com/aerusso/util-linux

* 'master' of https://github.com/aerusso/util-linux:
  fallocate: keep-size and zero-range are compatible

4 months agoMerge branch 'PR/scriptreplay-binding-help' of https://github.com/karelzak/util-linux...
Karel Zak [Wed, 12 Feb 2025 09:50:34 +0000 (10:50 +0100)] 
Merge branch 'PR/scriptreplay-binding-help' of https://github.com/karelzak/util-linux-work

* 'PR/scriptreplay-binding-help' of https://github.com/karelzak/util-linux-work:
  scriptreplay: add key bindings info to --help

4 months agoMerge branch 'PR/Benno-text-fixes-w7' of https://github.com/karelzak/util-linux-work
Karel Zak [Wed, 12 Feb 2025 09:50:05 +0000 (10:50 +0100)] 
Merge branch 'PR/Benno-text-fixes-w7' of https://github.com/karelzak/util-linux-work

* 'PR/Benno-text-fixes-w7' of https://github.com/karelzak/util-linux-work:
  zramctl: improve grammar in usage and don't gettextize list of algorithms
  usage: mention also the missing KiB and MiB as permissible suffixes
  man pages: use the same verb for --version as for --help, like in usages
  renice: put text that belongs together into a single translatable message
  blkzone: correct the wording of an error message, from ioctl to function
  blkpr: grammarize the description of the tool and its options
  textual: give seven error messages the same form as two others
  unshare: don't mark "|" and ":" as part of the placeholders
  mount: properly mark the arguments of the 'ro' and 'rw' extended options
  textual: consistently mark "=" as literal before an optional argument
  textual: remove other inconsistent uses of "=" before option argument
  unshare: use single asterisks around long options, double around values
  unshare: don't use "=" before a required option argument
  setpriv: make message for failing PR_GET_PDEATHSIG the same as the other

4 months agolsipc: (man) add note about default outputs
Karel Zak [Wed, 12 Feb 2025 09:40:31 +0000 (10:40 +0100)] 
lsipc: (man) add note about default outputs

Signed-off-by: Karel Zak <kzak@redhat.com>
4 months agoipc: coding style cosmetic changes
Karel Zak [Wed, 12 Feb 2025 09:33:58 +0000 (10:33 +0100)] 
ipc: coding style cosmetic changes

* Removed trailing white space
* Added comments to long #endif statements
* Improved indentation in some places
* Reduced size of lsipc --help lines

Signed-off-by: Karel Zak <kzak@redhat.com>
4 months agoMerge branch 'ipc' of https://github.com/PrasannaPaithankar/util-linux
Karel Zak [Wed, 12 Feb 2025 09:13:10 +0000 (10:13 +0100)] 
Merge branch 'ipc' of https://github.com/PrasannaPaithankar/util-linux

* 'ipc' of https://github.com/PrasannaPaithankar/util-linux:
  Defined macros for POSIX IPC compilation and removed path buffer.
  Fix CodeQL warning
  sys-utils: warns if mqueue fs is not mounted
  bash completions for IPC tools
  sys-utils: fixed build system for POSIX IPC tools
  rectified long formatting error
  configured for meson build system
  added POSIX IPC paathnames; modified sys-utils/Makemodule.am
  added POSIX IPC support to lsipc, ipcrm, ipcmk

4 months agofallocate: keep-size and zero-range are compatible
Antonio Russo [Tue, 11 Feb 2025 12:32:58 +0000 (05:32 -0700)] 
fallocate: keep-size and zero-range are compatible

Do not prevent --keep-size and --zero-range from being specified at the
same time, bringing this check into alignment with the documentation,
and completes b85feb999c505222d4815638344c8883d5e4ab58.

Signed-off-by: Antonio Enrico Russo <aerusso@aerusso.net>
5 months agoDefined macros for POSIX IPC compilation and removed path buffer.
Prasanna Paithankar [Mon, 10 Feb 2025 19:37:55 +0000 (01:07 +0530)] 
Defined macros for POSIX IPC compilation and removed path buffer.

Signed-off-by: Prasanna Paithankar <paithankarprasanna@gmail.com>
5 months agoscriptreplay: add key bindings info to --help
Karel Zak [Mon, 10 Feb 2025 11:51:28 +0000 (12:51 +0100)] 
scriptreplay: add key bindings info to --help

Addresses: https://github.com/util-linux/util-linux/discussions/3404
Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agozramctl: improve grammar in usage and don't gettextize list of algorithms
Benno Schulenberg [Sun, 9 Feb 2025 08:23:30 +0000 (09:23 +0100)] 
zramctl: improve grammar in usage and don't gettextize list of algorithms

There is no need to translate this list as they are all literal values
-- the word "and" is not needed: a comma will do.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agousage: mention also the missing KiB and MiB as permissible suffixes
Benno Schulenberg [Sun, 9 Feb 2025 08:23:29 +0000 (09:23 +0100)] 
usage: mention also the missing KiB and MiB as permissible suffixes

Also, slightly reword the phrase to be more grammatical,
and make it into a full sentence that ends in a period.

(By the way, commit f1970cc557 is somewhat problematic: it requires
that the relevant occurrences of "<num>" and "<size>" in the option
descriptions are now always translated in the same manner, but the
translator may be unaware of this.  For Dutch, the latter was the
case for `ipcmk` and `zramctl`. :/ )

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agoman pages: use the same verb for --version as for --help, like in usages
Benno Schulenberg [Sun, 9 Feb 2025 08:23:28 +0000 (09:23 +0100)] 
man pages: use the same verb for --version as for --help, like in usages

Also, avoid duplication of --help/--version in the man page for `chfn`.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agorenice: put text that belongs together into a single translatable message
Benno Schulenberg [Sun, 9 Feb 2025 08:23:27 +0000 (09:23 +0100)] 
renice: put text that belongs together into a single translatable message

Also, use semicolons and no periods in an option description.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agoblkzone: correct the wording of an error message, from ioctl to function
Benno Schulenberg [Sun, 9 Feb 2025 08:23:26 +0000 (09:23 +0100)] 
blkzone: correct the wording of an error message, from ioctl to function

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agoblkpr: grammarize the description of the tool and its options
Benno Schulenberg [Sun, 9 Feb 2025 08:23:25 +0000 (09:23 +0100)] 
blkpr: grammarize the description of the tool and its options

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agotextual: give seven error messages the same form as two others
Benno Schulenberg [Sun, 9 Feb 2025 08:23:24 +0000 (09:23 +0100)] 
textual: give seven error messages the same form as two others

The form with the parentheses is easier for translators: it indicates
that the preceding text is not a translatable word.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agounshare: don't mark "|" and ":" as part of the placeholders
Benno Schulenberg [Sun, 9 Feb 2025 08:23:23 +0000 (09:23 +0100)] 
unshare: don't mark "|" and ":" as part of the placeholders

The "|" is a meta-character, and should thus be left unmarked, while
the ":" (in the argument of --map-users/--map-groups) is a literal,
and should therefore be marked in bold.

Also, add the new 'subids' literal value for the above two options.

And in the bargain tweak a comment.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agomount: properly mark the arguments of the 'ro' and 'rw' extended options
Benno Schulenberg [Sun, 9 Feb 2025 08:23:22 +0000 (09:23 +0100)] 
mount: properly mark the arguments of the 'ro' and 'rw' extended options

The 'fs', 'vfs', and 'recursive' are literal values, not placeholders
for something else.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agotextual: consistently mark "=" as literal before an optional argument
Benno Schulenberg [Sun, 9 Feb 2025 08:23:21 +0000 (09:23 +0100)] 
textual: consistently mark "=" as literal before an optional argument

See, for example, how in `man cfdisk` the "=" after --color and after
--lock were differently marked.

(Basically done with `sed -i 's/\*\[=/\*\[\*\*=\*\*/' *utils/*.adoc`.)

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agotextual: remove other inconsistent uses of "=" before option argument
Benno Schulenberg [Sun, 9 Feb 2025 08:23:20 +0000 (09:23 +0100)] 
textual: remove other inconsistent uses of "=" before option argument

And remove inconsistent uses of double asterisks too.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agounshare: use single asterisks around long options, double around values
Benno Schulenberg [Sun, 9 Feb 2025 08:23:19 +0000 (09:23 +0100)] 
unshare: use single asterisks around long options, double around values

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agounshare: don't use "=" before a required option argument
Benno Schulenberg [Sun, 9 Feb 2025 08:23:18 +0000 (09:23 +0100)] 
unshare: don't use "=" before a required option argument

The "=" is not needed, is inconsistent with the presentation of the
other options that require an argument, and trying to use "=" with
the equivalent short option would lead to failure.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agosetpriv: make message for failing PR_GET_PDEATHSIG the same as the other
Benno Schulenberg [Sun, 9 Feb 2025 08:23:17 +0000 (09:23 +0100)] 
setpriv: make message for failing PR_GET_PDEATHSIG the same as the other

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agoMerge branch 'ci-s390x-workaround' of https://github.com/mrc0mmand/util-linux
Karel Zak [Mon, 10 Feb 2025 10:07:50 +0000 (11:07 +0100)] 
Merge branch 'ci-s390x-workaround' of https://github.com/mrc0mmand/util-linux

* 'ci-s390x-workaround' of https://github.com/mrc0mmand/util-linux:
  ci: temporarily switch the alt-arch job worker to Ubuntu 22.04

5 months agoci: temporarily switch the alt-arch job worker to Ubuntu 22.04
Frantisek Sumsal [Fri, 7 Feb 2025 08:47:06 +0000 (09:47 +0100)] 
ci: temporarily switch the alt-arch job worker to Ubuntu 22.04

Using Ubuntu 24.04 on the worker causes random segfaults in s390x
containers using qemu-user-static. Let's switch this, temporarily, to
Ubuntu 22.04 which doesn't seem to have this issue.

Note: the coverage shouldn't change, since the "inner" alt-arch
containers still use "ubuntu-latest" (24.04 ATTOW).

5 months agomeson: define have_linux_blkzoned_h
Frantisek Sumsal [Thu, 6 Feb 2025 18:44:43 +0000 (19:44 +0100)] 
meson: define have_linux_blkzoned_h

Follow-up for 92ea18aaa31120ebedefc389ca6be4eca9a81117.

5 months agoMerge branch 'PR/autotools-man-common' of https://github.com/karelzak/util-linux...
Karel Zak [Thu, 6 Feb 2025 15:34:58 +0000 (16:34 +0100)] 
Merge branch 'PR/autotools-man-common' of https://github.com/karelzak/util-linux-work

* 'PR/autotools-man-common' of https://github.com/karelzak/util-linux-work:
  autotools: always add man-common/ to EXTRA_DIST

5 months agomeson: check for blkzoned.h
Karel Zak [Thu, 6 Feb 2025 15:33:06 +0000 (16:33 +0100)] 
meson: check for blkzoned.h

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agoMerge branch 'INVARIANT_RESULT-in-lscpu-virt.c' of https://github.com/AntonMoryakov...
Karel Zak [Thu, 6 Feb 2025 12:08:28 +0000 (13:08 +0100)] 
Merge branch 'INVARIANT_RESULT-in-lscpu-virt.c' of https://github.com/AntonMoryakov/util-linux

* 'INVARIANT_RESULT-in-lscpu-virt.c' of https://github.com/AntonMoryakov/util-linux:
  sys-utils: remove redundant comparison in read_hypervisor_dmi in lscpu-virt.c

5 months agoautotools: always add man-common/ to EXTRA_DIST
Karel Zak [Thu, 6 Feb 2025 12:04:13 +0000 (13:04 +0100)] 
autotools: always add man-common/ to EXTRA_DIST

Addresses: https://github.com/util-linux/util-linux/issues/3401
Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agosys-utils: remove redundant comparison in read_hypervisor_dmi in lscpu-virt.c
Anton Moryakov [Wed, 5 Feb 2025 23:42:23 +0000 (02:42 +0300)] 
sys-utils: remove redundant comparison in read_hypervisor_dmi in lscpu-virt.c

5 months agoinclude/debug: Relicense to Public Domain
Karel Zak [Tue, 4 Feb 2025 09:10:57 +0000 (10:10 +0100)] 
include/debug: Relicense to Public Domain

After reaching an agreement with Ondrej Oprala, we have decided to
change the license of debug.h and debugobj.h from LGPL to Public
Domain. This change is more suitable for the files in the include/
directory of util-linux.

CC: Ondrej Oprala <ondrej.oprala@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agoMerge branch 'PR/Benno-text-fixes' of https://github.com/karelzak/util-linux-work
Karel Zak [Tue, 4 Feb 2025 09:06:22 +0000 (10:06 +0100)] 
Merge branch 'PR/Benno-text-fixes' of https://github.com/karelzak/util-linux-work

* 'PR/Benno-text-fixes' of https://github.com/karelzak/util-linux-work:
  setpriv: describe --groups more correctly in the usage text
  setpriv: consistently use "<caps>" to indicate a list of capabilities
  readprofile: put two things that belong together into a single message
  lsmem: make an error message identical to one used in seven other places
  logger: grammarize the description of --socket-errors in the man page

5 months agoMerge branch 'PR/lscpu-min-freq' of https://github.com/karelzak/util-linux-work
Karel Zak [Tue, 4 Feb 2025 09:05:48 +0000 (10:05 +0100)] 
Merge branch 'PR/lscpu-min-freq' of https://github.com/karelzak/util-linux-work

* 'PR/lscpu-min-freq' of https://github.com/karelzak/util-linux-work:
  lscpu: skip frequencies of 0 MHz when getting minmhz

5 months agolib/colors: fix fallback to system directory
Thomas Weißschuh [Mon, 3 Feb 2025 20:46:13 +0000 (21:46 +0100)] 
lib/colors: fix fallback to system directory

The current check relies on "*sfile" to recognize if a configuration has
been found in the current directory. However this condition is only true
for "type == UL_COLORFILE_SCHEME", breaking the .enable and .disable
configurations.
Instead reorder the logic a bit so that any valid configuration returns
rc == 0.

Reported-by: Axel <axel.scheepers76@gmail.com>
Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1094283
Reported-by: Chris Hofstaedtler <zeha@debian.org>
Link: https://lore.kernel.org/util-linux/Z5a08yD10L1J8AIa@per.namespace.at/
Tested-by: Chris Hofstaedtler <zeha@debian.org>
Fixes: 4bdf22803f9a ("lib/colors: ensure fallback to system directory")
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
5 months agoFix CodeQL warning
Prasanna Paithankar [Mon, 3 Feb 2025 13:20:42 +0000 (18:50 +0530)] 
Fix CodeQL warning

Signed-off-by: Prasanna Paithankar <paithankarprasanna@gmail.com>
5 months agosys-utils: warns if mqueue fs is not mounted
Prasanna Paithankar [Mon, 3 Feb 2025 13:07:01 +0000 (18:37 +0530)] 
sys-utils: warns if mqueue fs is not mounted

- Add a check to see if mqueue fs is mounted before using it, and warn
  the user if it is not mounted.
- bash completion for ipcrm is fixed to make it independent of awk.

Signed-off-by: Prasanna Paithankar <paithankarprasanna@gmail.com>
5 months agoMerge branch 'PR/libmount-mesgs-idmapping' of https://github.com/karelzak/util-linux...
Karel Zak [Mon, 3 Feb 2025 12:34:52 +0000 (13:34 +0100)] 
Merge branch 'PR/libmount-mesgs-idmapping' of https://github.com/karelzak/util-linux-work

* 'PR/libmount-mesgs-idmapping' of https://github.com/karelzak/util-linux-work:
  libmount: improve error messages in ID-mapping hook
  libmount: add private mnt_context_read_mesgs()
  libmount: reduce size of syscall-failed message

5 months agolscpu: skip frequencies of 0 MHz when getting minmhz
Ricardo Neri [Fri, 31 Jan 2025 03:25:32 +0000 (19:25 -0800)] 
lscpu: skip frequencies of 0 MHz when getting minmhz

read_mhz() sets cpu->mhz_min_freq from /sys/devices/system/cpu/cpuN/
cpufreq/cpuinfo_min_freq. The file read fails if cpuN is offline and
cpu->mhz_min_freq is left as 0. 0 MHz is treated as invalid frequency.

lsblk_cputype_get_minmhz() iterates through all possible CPUs to find the
minimum frequency. If one or more CPUs are offline, the minimum frequency
will be 0. This is reflected in the output of lscpu:

$ ./lscpu | grep min
CPU min MHz:                        0.0000

Ignore 0-MHz frequencies to find the actual minimum frequency:

$ ./lscpu | grep min
CPU min MHz:                     1200.0000

Reported-by: Thangamani Krishnan <thangamani.krishnan@intel.com>
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
5 months agosetpriv: describe --groups more correctly in the usage text
Benno Schulenberg [Sun, 2 Feb 2025 16:38:09 +0000 (17:38 +0100)] 
setpriv: describe --groups more correctly in the usage text

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agosetpriv: consistently use "<caps>" to indicate a list of capabilities
Benno Schulenberg [Sun, 2 Feb 2025 16:06:23 +0000 (17:06 +0100)] 
setpriv: consistently use "<caps>" to indicate a list of capabilities

The existing "<caps,...>" did not indicate that each capability name
must be preceded by "+" or "-".  Also, to indicate that the list needs
to be separated by commas, one would have to use "<cap>[,...]", not
"<cap,...>".  So... instead of trying to cram all that info in there,
just say "<caps>", like for --bounding-set.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agoreadprofile: put two things that belong together into a single message
Benno Schulenberg [Thu, 30 Jan 2025 15:50:48 +0000 (16:50 +0100)] 
readprofile: put two things that belong together into a single message

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agolsmem: make an error message identical to one used in seven other places
Benno Schulenberg [Thu, 30 Jan 2025 14:27:27 +0000 (15:27 +0100)] 
lsmem: make an error message identical to one used in seven other places

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agologger: grammarize the description of --socket-errors in the man page
Benno Schulenberg [Thu, 30 Jan 2025 14:11:24 +0000 (15:11 +0100)] 
logger: grammarize the description of --socket-errors in the man page

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agoMerge branch 'PR/mkswap-nocow' of https://github.com/karelzak/util-linux-work
Karel Zak [Mon, 3 Feb 2025 12:21:51 +0000 (13:21 +0100)] 
Merge branch 'PR/mkswap-nocow' of https://github.com/karelzak/util-linux-work

* 'PR/mkswap-nocow' of https://github.com/karelzak/util-linux-work:
  mkswap: remove unused variable for non-nocow systems
  mkswap: add features list to --version output
  mkswap: fix includes
  mkswap: improve --file option for use on btrfs

5 months agolibmount: improve error messages in ID-mapping hook
Karel Zak [Tue, 28 Jan 2025 12:23:15 +0000 (13:23 +0100)] 
libmount: improve error messages in ID-mapping hook

* save failed syscall status
* allow to read messages from kernel
* add proper error messages if kernel is silent

OLD:
  mount: /foo: mount failed: Unknown error 5013.
NEW:
  mount: /foo: mount_setattr() failed: cannot set ID-mapping: Operation not permitted.

Addresses: https://github.com/util-linux/util-linux/issues/3373
Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agolibmount: add private mnt_context_read_mesgs()
Karel Zak [Tue, 28 Jan 2025 12:13:02 +0000 (13:13 +0100)] 
libmount: add private mnt_context_read_mesgs()

Add a more generic function for reading messages from a file
descriptor. The new mount API is already used in multiple files.

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agolibmount: reduce size of syscall-failed message
Karel Zak [Tue, 28 Jan 2025 12:10:30 +0000 (13:10 +0100)] 
libmount: reduce size of syscall-failed message

The current version is too long.

OLD:
 mount: /mnt/test/fileA: mount_setattr system call failed: cannot set ID-mapping: Operation not permitted.

NEW:
 mount: /mnt/test/fileA: mount_setattr() failed: cannot set ID-mapping: Operation not permitted.

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agoMerge branch 'PR/dmesg-notime' of https://github.com/karelzak/util-linux-work
Karel Zak [Mon, 3 Feb 2025 11:32:46 +0000 (12:32 +0100)] 
Merge branch 'PR/dmesg-notime' of https://github.com/karelzak/util-linux-work

* 'PR/dmesg-notime' of https://github.com/karelzak/util-linux-work:
  dmesg: fix --notime use

5 months agomkswap: remove unused variable for non-nocow systems
Karel Zak [Mon, 3 Feb 2025 11:11:24 +0000 (12:11 +0100)] 
mkswap: remove unused variable for non-nocow systems

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agomkswap: add features list to --version output
Karel Zak [Mon, 3 Feb 2025 11:03:10 +0000 (12:03 +0100)] 
mkswap: add features list to --version output

* Define USE_NOCOW to simplify code
* Add array of features

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agomkswap: fix includes
Karel Zak [Mon, 3 Feb 2025 10:48:23 +0000 (11:48 +0100)] 
mkswap: fix includes

It is preferable to use #ifdefs in code that relies on available
features, rather than solely depending on the presence of header
files. This is especially important if the functionality of FIEMAP
relies on multiple include files. Additionally, note that we also need
linux/fs.h for S_NOCOW_FL, regardless of FIEMAP.

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agodmesg: fix --notime use
Karel Zak [Mon, 3 Feb 2025 10:29:44 +0000 (11:29 +0100)] 
dmesg: fix --notime use

The --notime command line option disables parsing of timestamps from
kmsg. This is a bug because the timestamps can be used for operations
other than just output. For example, they can be used for filters like
--since (dmesg --since '1 day ago' --notime).

Addresses: https://github.com/util-linux/util-linux/issues/3392
Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agobash completions for IPC tools
Prasanna Paithankar [Sun, 2 Feb 2025 18:07:44 +0000 (23:37 +0530)] 
bash completions for IPC tools

Signed-off-by: Prasanna Paithankar <paithankarprasanna@gmail.com>
5 months agobash-completion: updated lsns bash completion
Prasanna Paithankar [Sun, 2 Feb 2025 17:04:20 +0000 (22:34 +0530)] 
bash-completion: updated lsns bash completion

5 months agoblkid: allow up to 64k erofs block sizes
Eric Sandeen [Fri, 24 Jan 2025 14:37:12 +0000 (08:37 -0600)] 
blkid: allow up to 64k erofs block sizes

Today, mkfs.erofs defaults to page size for block size, but blkid
does not recognize this. Increase the limit to 64k.

Reviewed-by: Gao Xiang <xiang@kernel.org>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agoMerge branch 'PR/libuuid-pthread' of https://github.com/karelzak/util-linux-work
Karel Zak [Thu, 30 Jan 2025 08:50:02 +0000 (09:50 +0100)] 
Merge branch 'PR/libuuid-pthread' of https://github.com/karelzak/util-linux-work

* 'PR/libuuid-pthread' of https://github.com/karelzak/util-linux-work:
  libuuid: support non-cached scenarios (when -lpthread is unavailable)
  meson: add HAVE_LIBPTHREAD
  autotools: define HAVE_LIBPTHREAD and PTHREAD_LIBS
  c.h: consolidate THREAD_LOCAL.

5 months agoMerge branch 'lslogins' of https://github.com/thkukuk/util-linux
Karel Zak [Thu, 30 Jan 2025 08:49:22 +0000 (09:49 +0100)] 
Merge branch 'lslogins' of https://github.com/thkukuk/util-linux

* 'lslogins' of https://github.com/thkukuk/util-linux:
  lslogins: don't ignore stat error

5 months agoMerge branch 'PR/github-configure-fast' of https://github.com/karelzak/util-linux...
Karel Zak [Thu, 30 Jan 2025 08:42:57 +0000 (09:42 +0100)] 
Merge branch 'PR/github-configure-fast' of https://github.com/karelzak/util-linux-work

* 'PR/github-configure-fast' of https://github.com/karelzak/util-linux-work:
  github: enable verbose output, don't generate docs default

5 months agoscriptreplay: fix compiler warning
Karel Zak [Wed, 29 Jan 2025 11:38:46 +0000 (12:38 +0100)] 
scriptreplay: fix compiler warning

compiler warning:
  expected 'struct timeval * restrict' but argument is of type 'const struct timeval *'

On Linux, select() modifies timeout, so the timeout cannot be 'const'.

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agoMerge branch 'PR/build-widechar' of https://github.com/karelzak/util-linux-work
Karel Zak [Thu, 30 Jan 2025 08:39:28 +0000 (09:39 +0100)] 
Merge branch 'PR/build-widechar' of https://github.com/karelzak/util-linux-work

* 'PR/build-widechar' of https://github.com/karelzak/util-linux-work:
  Fix --disable-widechar compile warnings

5 months agomkswap: improve --file option for use on btrfs
Karel Zak [Wed, 29 Jan 2025 11:05:10 +0000 (12:05 +0100)] 
mkswap: improve --file option for use on btrfs

We will now try to set the "nocow" attribute, but will ignore it if it
is not supported.

Suggested-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agologger: (man) fix --socket-error
Karel Zak [Wed, 29 Jan 2025 12:31:10 +0000 (13:31 +0100)] 
logger: (man) fix --socket-error

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agoMerge branch 'PR/lscpu-cols-desc' of https://github.com/karelzak/util-linux-work
Karel Zak [Wed, 29 Jan 2025 12:20:07 +0000 (13:20 +0100)] 
Merge branch 'PR/lscpu-cols-desc' of https://github.com/karelzak/util-linux-work

* 'PR/lscpu-cols-desc' of https://github.com/karelzak/util-linux-work:
  lscpu: make three column descriptions more grammatical

5 months agoblkid: say "override" instead of "overwrite" in the --help text
Benno Schulenberg [Mon, 27 Jan 2025 15:21:44 +0000 (16:21 +0100)] 
blkid: say "override" instead of "overwrite" in the --help text

The `blkid` tool does not write anything to the probed device, so
seeing "overwrite" in the usage text was somewhat disconcerting.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agologger: do not show arguments of --socket-errors as optional in --help
Benno Schulenberg [Mon, 27 Jan 2025 11:08:25 +0000 (12:08 +0100)] 
logger: do not show arguments of --socket-errors as optional in --help

Also, show them without angular brackets, as they are literal values.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agoFix --disable-widechar compile warnings
Marc Aurèle La France [Sun, 26 Jan 2025 17:38:52 +0000 (10:38 -0700)] 
Fix --disable-widechar compile warnings

Fix warnings when compiling without wide char support.

Marc.

5 months agolscpu: make three column descriptions more grammatical
Benno Schulenberg [Sun, 26 Jan 2025 11:09:24 +0000 (12:09 +0100)] 
lscpu: make three column descriptions more grammatical

Change an adverb to an adjective, use the plural "lines",
and use the plural form of the verb "have".  Also, put a
clarification between parentheses, and reshuffle it a bit
for clarity.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
5 months agogithub: enable verbose output, don't generate docs default
Karel Zak [Tue, 28 Jan 2025 11:09:37 +0000 (12:09 +0100)] 
github: enable verbose output, don't generate docs default

Generating all documentation (man pages, man page translations, and
library API docs) is a very time-consuming task. It is also
architecture-independent, as it involves text conversions using
Python, Ruby, etc. It would be better to only do this once in CI and
only when all other tasks have been successfully completed.

This commit also enables verbose output for autotools to make the
compiler command line visible in logs.

* Add V=1 (verbose) for "make" command.

* Add CONFIGUREFAST phase with disabled po-man, asciidoc, and gtk-doc.

* Use full version CONFIGURE phase only for the distcheck CI job.

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agosys-utils: fixed build system for POSIX IPC tools
Prasanna Paithankar [Mon, 27 Jan 2025 20:50:00 +0000 (02:20 +0530)] 
sys-utils: fixed build system for POSIX IPC tools

5 months agoMerge branch 'posix-fallocate' of https://github.com/zeha/util-linux
Karel Zak [Mon, 27 Jan 2025 16:51:09 +0000 (17:51 +0100)] 
Merge branch 'posix-fallocate' of https://github.com/zeha/util-linux

* 'posix-fallocate' of https://github.com/zeha/util-linux:
  fallocate: forbid --posix with special options
  meson: correctly detect posix_fallocate

5 months agolslogins: don't ignore stat error
Thorsten Kukuk [Fri, 24 Jan 2025 16:06:48 +0000 (17:06 +0100)] 
lslogins: don't ignore stat error

Signed-off-by: Thorsten Kukuk <kukuk@suse.com>
5 months agolibuuid: support non-cached scenarios (when -lpthread is unavailable)
Karel Zak [Mon, 27 Jan 2025 13:28:36 +0000 (14:28 +0100)] 
libuuid: support non-cached scenarios (when -lpthread is unavailable)

This patch makes the dependence on pthread optional for libuuid. In
certain cases, such as Buildroot Linux, uClibc-ng, and very low
resource systems, libpthread may be unavailable.

If libuuid is compiled without pthread, it will not use a local cache
and will instead request a UUID from uuidd for each call. This may
result in less efficient performance, but the UUIDs generated will
still be unique and reliable.

On minimalistic systems, it is highly likely that uuidd will not be
installed, making this change important for portability and robust
code.

Addresses: https://github.com/util-linux/util-linux/pull/3375
Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agomeson: add HAVE_LIBPTHREAD
Karel Zak [Mon, 27 Jan 2025 13:11:35 +0000 (14:11 +0100)] 
meson: add HAVE_LIBPTHREAD

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agoautotools: define HAVE_LIBPTHREAD and PTHREAD_LIBS
Karel Zak [Mon, 27 Jan 2025 13:01:38 +0000 (14:01 +0100)] 
autotools: define HAVE_LIBPTHREAD and PTHREAD_LIBS

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agoc.h: consolidate THREAD_LOCAL.
Karel Zak [Mon, 27 Jan 2025 12:40:23 +0000 (13:40 +0100)] 
c.h: consolidate THREAD_LOCAL.

Let's define this macro in one place only.

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agorectified long formatting error
Prasanna Paithankar [Sat, 25 Jan 2025 12:15:12 +0000 (17:45 +0530)] 
rectified long formatting error

5 months agoconfigured for meson build system
Prasanna Paithankar [Sat, 25 Jan 2025 11:47:11 +0000 (17:17 +0530)] 
configured for meson build system

5 months agowhereis: avoid accessing uninitialized memory
xiovwx [Thu, 23 Jan 2025 11:06:27 +0000 (11:06 +0000)] 
whereis: avoid accessing uninitialized memory

5 months agoadded POSIX IPC paathnames; modified sys-utils/Makemodule.am
Prasanna Paithankar [Wed, 22 Jan 2025 21:48:31 +0000 (03:18 +0530)] 
added POSIX IPC paathnames; modified sys-utils/Makemodule.am

5 months agoadded POSIX IPC support to lsipc, ipcrm, ipcmk
Prasanna Paithankar [Wed, 22 Jan 2025 21:38:02 +0000 (03:08 +0530)] 
added POSIX IPC support to lsipc, ipcrm, ipcmk

5 months agofallocate: forbid --posix with special options
Chris Hofstaedtler [Tue, 21 Jan 2025 17:58:48 +0000 (18:58 +0100)] 
fallocate: forbid --posix with special options

Option --posix picks posix_fallocate, which does not have a
mode flag. Forbid using any options that set mode flags when
also giving --posix.

Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
5 months agoMerge branch 'column-handle-osc8-links' of https://github.com/juarezr/util-linux
Karel Zak [Wed, 22 Jan 2025 10:47:04 +0000 (11:47 +0100)] 
Merge branch 'column-handle-osc8-links' of https://github.com/juarezr/util-linux

* 'column-handle-osc8-links' of https://github.com/juarezr/util-linux:
  column: test ANSI SGR colors inside OSC 8 hyperlink escape codes
  column: handle ANSI SGR colors inside OSC 8 hyperlink escape codes
  column: test OSC 8 hyperlink escape sequences
  column: handle OSC 8 hyperlink escape sequences

5 months agomeson: correctly detect posix_fallocate
Chris Hofstaedtler [Tue, 21 Jan 2025 17:58:41 +0000 (18:58 +0100)] 
meson: correctly detect posix_fallocate

Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
5 months agoMerge branch 'master' of https://github.com/AntonMoryakov/util-linux
Karel Zak [Tue, 21 Jan 2025 14:05:32 +0000 (15:05 +0100)] 
Merge branch 'master' of https://github.com/AntonMoryakov/util-linux

* 'master' of https://github.com/AntonMoryakov/util-linux:
  setpriv.c: fix memory leak in parse_groups function

5 months agoautotools: add sysusers support
Karel Zak [Thu, 16 Jan 2025 17:02:30 +0000 (18:02 +0100)] 
autotools: add sysusers support

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agomeson: use tmpfilesdir pkg-config variable
Karel Zak [Thu, 16 Jan 2025 16:49:30 +0000 (17:49 +0100)] 
meson: use tmpfilesdir pkg-config variable

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agomeson: do not hardcode /var in uuidd-sysusers.conf.
Karel Zak [Thu, 16 Jan 2025 16:42:13 +0000 (17:42 +0100)] 
meson: do not hardcode /var in uuidd-sysusers.conf.

Let's follow the same approach as we use for other configuration files.

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agocolumn: test ANSI SGR colors inside OSC 8 hyperlink escape codes
Juarez Rudsatz [Sun, 19 Jan 2025 22:11:35 +0000 (19:11 -0300)] 
column: test ANSI SGR colors inside OSC 8 hyperlink escape codes

5 months agocolumn: handle ANSI SGR colors inside OSC 8 hyperlink escape codes
Juarez Rudsatz [Sun, 19 Jan 2025 22:10:53 +0000 (19:10 -0300)] 
column: handle ANSI SGR colors inside OSC 8 hyperlink escape codes

5 months agocolumn: test OSC 8 hyperlink escape sequences
Juarez Rudsatz [Sun, 19 Jan 2025 20:28:07 +0000 (17:28 -0300)] 
column: test OSC 8 hyperlink escape sequences

5 months agocolumn: handle OSC 8 hyperlink escape sequences
Juarez Rudsatz [Sun, 19 Jan 2025 20:26:54 +0000 (17:26 -0300)] 
column: handle OSC 8 hyperlink escape sequences

5 months agosetpriv.c: fix memory leak in parse_groups function
AntonMoryakov [Thu, 16 Jan 2025 16:24:20 +0000 (19:24 +0300)] 
setpriv.c: fix memory leak in parse_groups function

The static analyzer flagged a memory leak in the parse_groups function.
The memory allocated for 'buf' (via xstrdup) was not freed at the end
of the function, leading to a memory leak.

Changes:
- Added free(buf) at the end of the function to release allocated memory.

Triggers found by static analyzer Svace.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
5 months agoMerge branch 'uuiddd-sysusers' of https://github.com/keszybz/util-linux
Karel Zak [Thu, 16 Jan 2025 16:22:53 +0000 (17:22 +0100)] 
Merge branch 'uuiddd-sysusers' of https://github.com/keszybz/util-linux

* 'uuiddd-sysusers' of https://github.com/keszybz/util-linux:
  lastlog2,uuidd: rename tmpfiles config file
  uuidd: add sysusers file

5 months agoMerge branch 'PR/sulogin-locale' of https://github.com/karelzak/util-linux-work
Karel Zak [Thu, 16 Jan 2025 16:11:49 +0000 (17:11 +0100)] 
Merge branch 'PR/sulogin-locale' of https://github.com/karelzak/util-linux-work

* 'PR/sulogin-locale' of https://github.com/karelzak/util-linux-work:
  sulogin: extend --version features list
  sulogin: fix POSIX locale use

5 months agoMerge branch 'master' of https://github.com/stanislav-brabec/util-linux
Karel Zak [Thu, 16 Jan 2025 16:11:21 +0000 (17:11 +0100)] 
Merge branch 'master' of https://github.com/stanislav-brabec/util-linux

* 'master' of https://github.com/stanislav-brabec/util-linux:
  Add fuse.portal to list of pseudo file systems

5 months agolsns: check for mnt_fs_get_target return value
Karel Zak [Thu, 16 Jan 2025 16:10:25 +0000 (17:10 +0100)] 
lsns: check for mnt_fs_get_target return value

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agoMerge branch 'master' of https://github.com/AntonMoryakov/util-linux
Karel Zak [Thu, 16 Jan 2025 16:07:59 +0000 (17:07 +0100)] 
Merge branch 'master' of https://github.com/AntonMoryakov/util-linux

* 'master' of https://github.com/AntonMoryakov/util-linux:
  sys-utils: fix add NULL check for mnt_fs_get_target return value

5 months agolsfd: remove C++ comment
Karel Zak [Thu, 16 Jan 2025 16:06:19 +0000 (17:06 +0100)] 
lsfd: remove C++ comment

Signed-off-by: Karel Zak <kzak@redhat.com>
5 months agoMerge branch 'patch-2' of https://github.com/hmaarrfk/util-linux
Karel Zak [Thu, 16 Jan 2025 16:02:51 +0000 (17:02 +0100)] 
Merge branch 'patch-2' of https://github.com/hmaarrfk/util-linux

* 'patch-2' of https://github.com/hmaarrfk/util-linux:
  refactor things to avoid an other header.
  Include errno.h within lsfd.c