diff options
| author | Karel Zak | 2012-03-26 13:09:27 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-03-26 13:09:27 +0200 |
| commit | 24d741d88a31863e82feb3f3a4516d7df006378b (patch) | |
| tree | 9693db14f0fc955a353895bfa43b325218c25a97 | |
| parent | tests: update (diff) | |
| download | kernel-qcow2-util-linux-24d741d88a31863e82feb3f3a4516d7df006378b.tar.gz kernel-qcow2-util-linux-24d741d88a31863e82feb3f3a4516d7df006378b.tar.xz kernel-qcow2-util-linux-24d741d88a31863e82feb3f3a4516d7df006378b.zip | |
docs: mark udev and list blkid(8) output formats deprecated
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | Documentation/deprecated.txt | 5 | ||||
| -rw-r--r-- | misc-utils/blkid.8 | 7 | ||||
| -rw-r--r-- | misc-utils/blkid.c | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt index cbed7de17..0d41feb90 100644 --- a/Documentation/deprecated.txt +++ b/Documentation/deprecated.txt @@ -2,6 +2,11 @@ The following is a list of commands or features that are deprecated. All deprecated utils are in maintenance mode and we keep them in source tree for backward compatibility only. +What: 'udev' and 'list' blkid(8) output formats +Why: udevd links libblkid directly; the 'list' is unnecessary, use lsblk(8) + +-------------------------- + What: line(1) command Why: useless, nobody uses this command, head(1) is better diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8 index c8a31210a..6bde6bceb 100644 --- a/misc-utils/blkid.8 +++ b/misc-utils/blkid.8 @@ -156,7 +156,10 @@ print the value of the tags .TP .B list print the devices in a user-friendly format; this output format is unsupported -for low-level probing (\fB-p\fR or \fB-i\fR) +for low-level probing (\fB-p\fR or \fB-i\fR). This output format is \fBDEPRECATED\fR +in favour of +.BR lsblk (8) +command. .TP .B device print the device name only; this output format is always enabled for \fB-L\fR @@ -168,7 +171,7 @@ prefixed by ID_FS_ or ID_PART_ prefixes The udev output returns the ID_FS_AMBIVALENT tag if more superblocks are detected, and ID_PART_ENTRY_* tags are always returned for all partitions including empty -partitions. +partitions. This output format is \fBDEPRECATED\fR. .TP .B export print key=value pairs for easy import into the environment; this output format diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index dfdb8b96b..1e8073ede 100644 --- a/misc-utils/blkid.c +++ b/misc-utils/blkid.c @@ -31,8 +31,8 @@ extern int optind; #define OUTPUT_VALUE_ONLY (1 << 1) #define OUTPUT_DEVICE_ONLY (1 << 2) -#define OUTPUT_PRETTY_LIST (1 << 3) -#define OUTPUT_UDEV_LIST (1 << 4) +#define OUTPUT_PRETTY_LIST (1 << 3) /* deprecated */ +#define OUTPUT_UDEV_LIST (1 << 4) /* deprecated */ #define OUTPUT_EXPORT_LIST (1 << 5) #define LOWPROBE_TOPOLOGY (1 << 1) @@ -73,7 +73,7 @@ static void usage(int error) " -h print this usage message and exit\n" " -g garbage collect the blkid cache\n" " -o <format> output format; can be one of:\n" - " value, device, list, udev, export or full; (default: full)\n" + " value, device, export or full; (default: full)\n" " -k list all known filesystems/RAIDs and exit\n" " -s <tag> show specified tag(s) (default show all tags)\n" " -t <token> find device with a specific token (NAME=value pair)\n" @@ -749,7 +749,7 @@ int main(int argc, char **argv) else if (!strcmp(optarg, "device")) output_format = OUTPUT_DEVICE_ONLY; else if (!strcmp(optarg, "list")) - output_format = OUTPUT_PRETTY_LIST; + output_format = OUTPUT_PRETTY_LIST; /* deprecated */ else if (!strcmp(optarg, "udev")) output_format = OUTPUT_UDEV_LIST; else if (!strcmp(optarg, "export")) |