picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bootctl: add -x shortcut for --print-boot-path

Browse source 
It's a quite useful option, let's match -p.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-05-19 11:55:36 +02:00
parent 405b104df6
commit fba4e94506
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
man/bootctl.xml
View file

@ -65,6 +65,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-x</option></term>
<term><option>--print-boot-path</option></term> <term><option>--print-boot-path</option></term>
<listitem><para>This option modifies the behaviour of <command>status</command>. Prints only the <listitem><para>This option modifies the behaviour of <command>status</command>. Prints only the
path to the Extended Boot Loader partition if it exists, and the path to the ESP otherwise to path to the Extended Boot Loader partition if it exists, and the path to the ESP otherwise to

9
src/boot/bootctl.c
View file

@ -997,7 +997,7 @@ static int help(int argc, char *argv[], void *userdata) {
" --esp-path=PATH Path to the EFI System Partition (ESP)\n" " --esp-path=PATH Path to the EFI System Partition (ESP)\n"
" --boot-path=PATH Path to the $BOOT partition\n" " --boot-path=PATH Path to the $BOOT partition\n"
" -p --print-esp-path Print path to the EFI System Partition\n" " -p --print-esp-path Print path to the EFI System Partition\n"
" --print-boot-path Print path to the $BOOT partition\n" " -x --print-boot-path Print path to the $BOOT partition\n"
" --no-variables Don't touch EFI variables\n" " --no-variables Don't touch EFI variables\n"
" --no-pager Do not pipe output into a pager\n" " --no-pager Do not pipe output into a pager\n"
"\nBoot Loader Commands:\n" "\nBoot Loader Commands:\n"
@ -1020,7 +1020,6 @@ static int parse_argv(int argc, char *argv[]) {
enum { enum {
ARG_ESP_PATH = 0x100, ARG_ESP_PATH = 0x100,
ARG_BOOT_PATH, ARG_BOOT_PATH,
ARG_PRINT_BOOT_PATH,
ARG_VERSION, ARG_VERSION,
ARG_NO_VARIABLES, ARG_NO_VARIABLES,
ARG_NO_PAGER, ARG_NO_PAGER,
@ -1034,7 +1033,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "boot-path", required_argument, NULL, ARG_BOOT_PATH }, { "boot-path", required_argument, NULL, ARG_BOOT_PATH },
{ "print-esp-path", no_argument, NULL, 'p' }, { "print-esp-path", no_argument, NULL, 'p' },
{ "print-path", no_argument, NULL, 'p' }, /* Compatibility alias */ { "print-path", no_argument, NULL, 'p' }, /* Compatibility alias */
{ "print-boot-path", no_argument, NULL, ARG_PRINT_BOOT_PATH }, { "print-boot-path", no_argument, NULL, 'x' },
{ "no-variables", no_argument, NULL, ARG_NO_VARIABLES }, { "no-variables", no_argument, NULL, ARG_NO_VARIABLES },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER }, { "no-pager", no_argument, NULL, ARG_NO_PAGER },
{} {}
@ -1045,7 +1044,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0); assert(argc >= 0);
assert(argv); assert(argv);
while ((c = getopt_long(argc, argv, "hp", options, NULL)) >= 0) while ((c = getopt_long(argc, argv, "hpx", options, NULL)) >= 0)
switch (c) { switch (c) {
case 'h': case 'h':
@ -1071,7 +1070,7 @@ static int parse_argv(int argc, char *argv[]) {
arg_print_esp_path = true; arg_print_esp_path = true;
break; break;
case ARG_PRINT_BOOT_PATH: case 'x':
arg_print_dollar_boot_path = true; arg_print_dollar_boot_path = true;
break; break;