btrfs-progs: convert: print builtin features in --version output

For parity with 'btrfs', also print the builtin features, although not all of them are relevant. $ btrfs-convert --version btrfs-convert, part of btrfs-progs v6.12 +EXPERIMENTAL -INJECT -STATIC +LZO +ZSTD +UDEV +FSVERITY +ZONED CRYPTO=builtin Signed-off-by: David Sterba <[email protected]>
kdave · Feb 11, 2025 · 65ad4e4 · 65ad4e4
1 parent 2e118b1
commit 65ad4e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Documentation/btrfs-convert.rst b/Documentation/btrfs-convert.rst
@@ -64,6 +64,9 @@ OPTIONS
         * *copy* - copy UUID from the source filesystem
         * *UUID* - a conforming UUID value, the 36 byte string representation
 
+--version
+        Print the :command:`btrfs-convert` version, builtin features and exit.
+
 EXIT STATUS
 -----------
 

diff --git a/convert/main.c b/convert/main.c
@@ -1869,7 +1869,7 @@ static const char * const convert_usage[] = {
 	OPTLINE("--no-progress", "show only overview, not the detailed progress"),
 	"",
 	"General:",
-	OPTLINE("--version", "print the btrfs-convert version and exit"),
+	OPTLINE("--version", "print the btrfs-convert version, builtin features and exit"),
 	OPTLINE("--help", "print this help and exit"),
 	"",
 	"Supported filesystems:",
@@ -2029,7 +2029,7 @@ int BOX_MAIN(convert)(int argc, char *argv[])
 				}
 				break;
 			case GETOPT_VAL_VERSION:
-				printf("btrfs-convert, part of %s\n", PACKAGE_STRING);
+				help_builtin_features("btrfs-convert, part of ");
 				ret = 0;
 				goto success;
 			case GETOPT_VAL_HELP: