From 76c068b77cd75d1ec082b3a67bea7098daefd2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 28 Apr 2022 16:44:40 +0200 Subject: [PATCH] man: cross-advertize bootctl and systemctl boot loader support --- TODO | 1 + man/bootctl.xml | 23 +++++++++++++++++++---- man/systemctl.xml | 18 ++++++++++++------ 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/TODO b/TODO index 422ef68cd6..513fba09c5 100644 --- a/TODO +++ b/TODO @@ -31,6 +31,7 @@ External: * zsh shell completion: - - should complete options, but currently does not - systemctl add-wants,add-requires + - systemctl reboot --boot-loader-entry= * systemctl status should know about 'systemd-analyze calendar ... --iterations=' * If timer has just OnInactiveSec=..., it should fire after a specified time diff --git a/man/bootctl.xml b/man/bootctl.xml index 4aab53ece1..99cef4c00a 100644 --- a/man/bootctl.xml +++ b/man/bootctl.xml @@ -62,7 +62,12 @@ boolean argument which controls whether to show the firmware setup on next system reboot. If the argument is omitted shows the current status of the flag, or whether the flag is supported. This controls the same flag as systemctl reboot --firmware-setup, but is more low-level - and allows setting the flag independently from actually requesting a reboot. + and allows setting the flag independently from actually requesting a reboot. + + Hint: use systemctl reboot --firmware-setup to reboot into firmware setup + once. See + systemctl1 + for details. @@ -107,7 +112,10 @@ pattern as argument. The command will set the default entry only for the next boot, the will set it persistently for all future boots. - Optionally, the boot loader entry ID may be specified as one of: , + bootctl list can be used to list available boot loader entries and their + IDs. + + In addition, the boot loader entry ID may be specified as one of: , or , which correspond to the current default boot loader entry for all future boots, the current default boot loader entry for the next boot, and the currently booted boot loader entry. These special IDs are resolved to the current values of the EFI variables @@ -120,8 +128,15 @@ If set to the chosen entry will be saved as an EFI variable on every boot and automatically selected the next time the boot loader starts. - When an empty string ("") is specified as an ID, then the corresponding EFI variable will be unset. - + When an empty string ("") is specified as the ID, then the corresponding EFI variable will be + unset. + + Hint: use systemctl reboot --boot-loader-entry=ID + to reboot into a specific boot entry and + systemctl reboot --boot-loader-menu=timeout + to reboot into the boot loader menu once. See + systemctl1 + for details. diff --git a/man/systemctl.xml b/man/systemctl.xml index d87c52685c..963eb9ec3a 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1447,10 +1447,12 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err reboot - Shut down and reboot the system. This is mostly equivalent to systemctl start reboot.target - --job-mode=replace-irreversibly --no-block, but also prints a wall message to all users. This - command is asynchronous; it will return after the reboot operation is enqueued, without waiting for it to - complete. + Shut down and reboot the system. + + This command mostly equivalent to systemctl start reboot.target + --job-mode=replace-irreversibly --no-block, but also prints a wall message to all + users. This command is asynchronous; it will return after the reboot operation is enqueued, + without waiting for it to complete. If combined with , shutdown of all running services is skipped, however all processes are killed and all file systems are unmounted or mounted read-only, immediately followed by the @@ -1463,6 +1465,10 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err If the switch is given, it will be passed as the optional argument to the reboot2 system call. + + Options , , and + can be used to select what to do after the + reboot. See the descriptions of those options for details. @@ -2249,7 +2255,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err - + When used with the reboot command, indicate to the system's boot loader to @@ -2260,7 +2266,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err - + When used with the reboot command, indicate to the system's boot loader to