bootctl: do not allow -x and -p to be used together

-x already prints the path to ESP in some circumstances, and allowing both to be printed seems confusing.
2019-05-19 12:01:32 +02:00
parent fba4e94506
commit aa467bcae1
2 changed files with 13 additions and 7 deletions
@@ -1067,10 +1067,16 @@ static int parse_argv(int argc, char *argv[]) {
                        break;

                case 'p':
+                        if (arg_print_dollar_boot_path)
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                                       "--print-boot-path/-x cannot be combined with --print-esp-path/-p");
                        arg_print_esp_path = true;
                        break;

                case 'x':
+                        if (arg_print_esp_path)
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                                       "--print-boot-path/-x cannot be combined with --print-esp-path/-p");
                        arg_print_dollar_boot_path = true;
                        break;