From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 4 Jul 2023 11:04:56 +0000 (+0200)
Subject: NEWS/--help: correct/be clearer on bootclt -R vs. -RR
X-Git-Tag: v254-rc1~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5163f9c8729c7f461392214f3ed131755249353;p=thirdparty%2Fsystemd.git

NEWS/--help: correct/be clearer on bootclt -R vs. -RR

The NEWS file was simply wrong. Let's also improve the --help text on
this.

Fixes: #28221
---

diff --git a/NEWS b/NEWS
index 3e673557daa..ed9c8d51fe2 100644
--- a/NEWS
+++ b/NEWS
@@ -221,9 +221,11 @@ CHANGES WITH 254 in spe:
         systemd-boot, systemd-stub, ukify, bootctl, kernel-install:
 
         * bootctl gained a new switch --print-root-device/-R that prints the
-          main block device the root file system is backed by. It's useful for
-          invocations such as "cfdisk $(bootctl -R)" to quickly show the
-          partition table of the running OS.
+          block device the root file system is backed by. If specified twice,
+          it returns the whole disk block device (as opposed to partition block
+          device) the root file system is on. It's useful for invocations such
+          as "cfdisk $(bootctl -RR)" to quickly show the partition table of the
+          running OS.
 
         * systemd-stub will now look for the SMBIOS Type 1 field
           "io.systemd.stub.kernel-cmdline-extra" and append its value to the
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 160cf83ce6a..a86ab84d190 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -178,7 +178,10 @@ static int help(int argc, char *argv[], void *userdata) {
                "  -p --print-esp-path  Print path to the EFI System Partition mount point\n"
                "  -x --print-boot-path Print path to the $BOOT partition mount point\n"
                "  -R --print-root-device\n"
-               "                       Print path to the root device node\n"
+               "                       Print path to the block device node backing the\n"
+               "                       root file system (returns e.g. /dev/nvme0n1p5)\n"
+               "  -RR                  Print path to the whole disk block device node\n"
+               "                       backing the root FS (returns e.g. /dev/nvme0n1)\n"
                "     --no-variables    Don't touch EFI variables\n"
                "     --no-pager        Do not pipe output into a pager\n"
                "     --graceful        Don't fail when the ESP cannot be found or EFI\n"