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

For parity with 'btrfs', also print the builtin features. $ btrfs-image --version btrfs-image, 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 · 0df367a · 0df367a
1 parent 65ad4e4
commit 0df367a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Documentation/btrfs-image.rst b/Documentation/btrfs-image.rst
@@ -57,6 +57,9 @@ OPTIONS
 -m
         Restore for multiple devices, more than 1 device should be provided.
 
+--version
+        Print the :command:`btrfs-image` version, builtin features and exit.
+
 EXIT STATUS
 -----------
 

diff --git a/image/main.c b/image/main.c
@@ -57,7 +57,7 @@ static const char * const image_usage[] = {
 	OPTLINE("-d", "also dump data, conflicts with -w"),
 	"",
 	"General:",
-	OPTLINE("--version", "print the btrfs-image version and exit"),
+	OPTLINE("--version", "print the btrfs-image version, builtin featurues and exit"),
 	OPTLINE("--help", "print this help and exit"),
 	"",
 	"In the dump mode, source is the btrfs device and target is the output file (use '-' for stdout).",
@@ -140,7 +140,7 @@ int BOX_MAIN(image)(int argc, char *argv[])
 			dump_data = true;
 			break;
 		case GETOPT_VAL_VERSION:
-			printf("btrfs-image, part of %s\n", PACKAGE_STRING);
+			help_builtin_features("btrfs-image, part of ");
 			ret = 0;
 			goto success;
 		case GETOPT_VAL_HELP:
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,9 @@ OPTIONS @@
     -m
             Restore for multiple devices, more than 1 device should be provided.
+    --version
+            Print the :command:`btrfs-image` version, builtin features and exit.
     EXIT STATUS
     -----------
@@ Expand Down @@