From c5220a940d00fc2520c702104939d0a4cf637254 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Tue, 25 Mar 2014 14:15:44 +0100 Subject: systemctl: delete REBOOT_PARAM_FILE if no parameter is specified And move it to sperate function. --- src/systemctl/systemctl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/systemctl/systemctl.c') diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 1b381f7a90..1717c1929e 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -6018,13 +6018,10 @@ static int halt_parse_argv(int argc, char *argv[]) { } } - if (arg_action == ACTION_REBOOT && argc == optind + 1) { - r = write_string_file(REBOOT_PARAM_FILE, argv[optind]); - if (r < 0) { - log_error("Failed to write reboot param to " - REBOOT_PARAM_FILE": %s", strerror(-r)); + if (arg_action == ACTION_REBOOT && (argc == optind || argc == optind + 1)) { + r = update_reboot_param_file(argc == optind + 1 ? argv[optind] : NULL); + if (r < 0) return r; - } } else if (optind < argc) { log_error("Too many arguments."); return -EINVAL; -- cgit v1.2.3-54-g00ecf