From bed2723caa98d6f752e9f5ab35a98e9d4a057e03 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 26 Aug 2025 00:33:40 +0900 Subject: [PATCH] bootctl: drop unnecessary verb_unlink() It is a trivial wrapper for verb_list(). Let's directly use verb_list() and drop verb_unlink(). Follow-up for 8702496bfb0205764569782a9a2ebd11fd80e5e8. --- src/bootctl/bootctl-status.c | 4 ---- src/bootctl/bootctl-status.h | 1 - src/bootctl/bootctl.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/bootctl/bootctl-status.c b/src/bootctl/bootctl-status.c index 069a1d7a4c6..dc79779db11 100644 --- a/src/bootctl/bootctl-status.c +++ b/src/bootctl/bootctl-status.c @@ -929,10 +929,6 @@ int verb_list(int argc, char *argv[], void *userdata) { } } -int verb_unlink(int argc, char *argv[], void *userdata) { - return verb_list(argc, argv, userdata); -} - int vl_method_list_boot_entries(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata) { _cleanup_(boot_config_free) BootConfig config = BOOT_CONFIG_NULL; dev_t esp_devid = 0, xbootldr_devid = 0; diff --git a/src/bootctl/bootctl-status.h b/src/bootctl/bootctl-status.h index b26a2b1f6f4..6dfc578a0c0 100644 --- a/src/bootctl/bootctl-status.h +++ b/src/bootctl/bootctl-status.h @@ -4,6 +4,5 @@ int verb_status(int argc, char *argv[], void *userdata); int verb_list(int argc, char *argv[], void *userdata); -int verb_unlink(int argc, char *argv[], void *userdata); int vl_method_list_boot_entries(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata); diff --git a/src/bootctl/bootctl.c b/src/bootctl/bootctl.c index 5c649ef1e34..0ef17ba5019 100644 --- a/src/bootctl/bootctl.c +++ b/src/bootctl/bootctl.c @@ -682,7 +682,7 @@ static int bootctl_main(int argc, char *argv[]) { { "kernel-identify", 2, 2, 0, verb_kernel_identify }, { "kernel-inspect", 2, 2, 0, verb_kernel_inspect }, { "list", VERB_ANY, 1, 0, verb_list }, - { "unlink", 2, 2, 0, verb_unlink }, + { "unlink", 2, 2, 0, verb_list }, { "cleanup", VERB_ANY, 1, 0, verb_list }, { "set-default", 2, 2, 0, verb_set_efivar }, { "set-oneshot", 2, 2, 0, verb_set_efivar }, -- 2.47.3