Adding upstream version 2.40.upstream/2.40

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 29 insertions, 13 deletions

diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index d5c5d4f..56fe1f1 100644
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -2,12 +2,12 @@
 .\"     Title: findmnt
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.20
-.\"      Date: 2023-12-01
+.\"      Date: 2024-03-20
 .\"    Manual: System Administration
-.\"    Source: util-linux 2.39.3
+.\"    Source: util-linux 2.40
 .\"  Language: English
 .\"
-.TH "FINDMNT" "8" "2023-12-01" "util\-linux 2.39.3" "System Administration"
+.TH "FINDMNT" "8" "2024-03-20" "util\-linux 2.40" "System Administration"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -80,14 +80,9 @@ Do not canonicalize paths at all. This option affects the comparing of paths and
 Canonicalize all printed paths.
 .RE
 .sp
-\fB\-\-deleted\fP
-.RS 4
-Print filesystems where target (mountpoint) is marked as deleted by kernel.
-.RE
-.sp
 \fB\-D\fP, \fB\-\-df\fP
 .RS 4
-Imitate the output of \fBdf\fP(1). This option is equivalent to \fB\-o SOURCE,FSTYPE,SIZE,USED,AVAIL,USE%,TARGET\fP but excludes all pseudo filesystems. Use \fB\-\-all\fP to print all filesystems.
+Imitate the output of \fBdf\fP(1). This option is equivalent to \fB\-o SOURCE,FSTYPE,SIZE,USED,AVAIL,USE%,TARGET\fP but excludes all pseudo filesystems. Use \fB\-\-all\fP to print all filesystems. See also \fB\-I\fP, \fB\-\-dfi\fP options.
 .RE
 .sp
 \fB\-d\fP, \fB\-\-direction\fP \fIword\fP
@@ -110,6 +105,16 @@ Search in an alternative file. If used with \fB\-\-fstab\fP, \fB\-\-mtab\fP or \
 Print the first matching filesystem only.
 .RE
 .sp
+\fB\-H\fP, \fB\-\-list\-columns\fP
+.RS 4
+List the available columns, use with \fB\-\-json\fP or \fB\-\-raw\fP to get output in machine\-readable format.
+.RE
+.sp
+\fB\-I\fP, \fB\-\-dfi\fP
+.RS 4
+Imitate the output of \fBdf\fP(1) with its \fB\-i\fP option. This option is equivalent to \fB\-o SOURCE,FSTYPE,INO.TOTAL,INO.USED,INO.AVAIL,INO.USE%,TARGET\fP but excludes all pseudo filesystems. Use \fB\-\-all\fP to print all filesystems.
+.RE
+.sp
 \fB\-i\fP, \fB\-\-invert\fP
 .RS 4
 Invert the sense of matching.
@@ -170,6 +175,8 @@ Output almost all available columns. The columns that require \fB\-\-poll\fP are
 \fB\-P\fP, \fB\-\-pairs\fP
 .RS 4
 Produce output in the form of key="value" pairs. All potentially unsafe value characters are hex\-escaped (\(rsx<code>). See also option \fB\-\-shell\fP.
+.sp
+Note that SOURCES column, use multi\-line cells. In these cases, the column use an array\-like formatting in the output, for example \fBname=("aaa" "bbb" "ccc")\fP.
 .RE
 .sp
 \fB\-p\fP, \fB\-\-poll\fP[\fI=list\fP]
@@ -214,6 +221,8 @@ Print recursively all submounts for the selected filesystems. The restrictions d
 \fB\-r\fP, \fB\-\-raw\fP
 .RS 4
 Use raw output format. All potentially unsafe characters are hex\-escaped (\(rsx<code>).
+.sp
+Note that column SOURCES, use multi\-line cells. In these cases, the column may produce more strings on the same line.
 .RE
 .sp
 \fB\-\-real\fP
diff --git a/misc-utils/findmnt.8.adoc b/misc-utils/findmnt.8.adoc
index 0cb7f0e..941eb6c 100644
--- a/misc-utils/findmnt.8.adoc
+++ b/misc-utils/findmnt.8.adoc
@@ -48,11 +48,8 @@ Do not canonicalize paths at all. This option affects the comparing of paths and
 *-c*, *--canonicalize*::
 Canonicalize all printed paths.
 
-*--deleted*::
-Print filesystems where target (mountpoint) is marked as deleted by kernel.
-
 *-D*, *--df*::
-Imitate the output of *df*(1). This option is equivalent to *-o SOURCE,FSTYPE,SIZE,USED,AVAIL,USE%,TARGET* but excludes all pseudo filesystems. Use *--all* to print all filesystems.
+Imitate the output of *df*(1). This option is equivalent to *-o SOURCE,FSTYPE,SIZE,USED,AVAIL,USE%,TARGET* but excludes all pseudo filesystems. Use *--all* to print all filesystems. See also *-I*, *--dfi* options.
 
 *-d*, *--direction* _word_::
 The search direction, either *forward* or *backward*.
@@ -66,6 +63,12 @@ Search in an alternative file. If used with *--fstab*, *--mtab* or *--kernel*, t
 *-f*, *--first-only*::
 Print the first matching filesystem only.
 
+*-H*, *--list-columns*::
+List the available columns, use with *--json* or *--raw* to get output in machine-readable format.
+
+*-I*, *--dfi*::
+Imitate the output of *df*(1) with its *-i* option. This option is equivalent to *-o SOURCE,FSTYPE,INO.TOTAL,INO.USED,INO.AVAIL,INO.USE%,TARGET* but excludes all pseudo filesystems. Use *--all* to print all filesystems.
+
 *-i*, *--invert*::
 Invert the sense of matching.
 
@@ -105,6 +108,8 @@ Output almost all available columns. The columns that require *--poll* are not i
 
 *-P*, *--pairs*::
 Produce output in the form of key="value" pairs. All potentially unsafe value characters are hex-escaped (\x<code>). See also option *--shell*.
++
+Note that SOURCES column, use multi-line cells. In these cases, the column use an array-like formatting in the output, for example *name=("aaa" "bbb" "ccc")*.
 
 *-p*, *--poll*[_=list_]::
 Monitor changes in the _/proc/self/mountinfo_ file. Supported actions are: mount, umount, remount and move. More than one action may be specified in a comma-separated list. All actions are monitored by default.
@@ -131,6 +136,8 @@ Print recursively all submounts for the selected filesystems. The restrictions d
 
 *-r*, *--raw*::
 Use raw output format. All potentially unsafe characters are hex-escaped (\x<code>).
++
+Note that column SOURCES, use multi-line cells. In these cases, the column may produce more strings on the same line.
 
 *--real*::
 Print only real filesystems.