shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

firstboot: use static destructor and DEFINE_MAIN_FUNCTION() macro

Browse Source
This commit is contained in:
Yu Watanabe 2018-11-20 17:52:57 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 149afb45dc
commit 45f394187a
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/firstboot/firstboot.c
View File

@ -27,6 +27,7 @@
#include "fs-util.h"
#include "hostname-util.h"
#include "locale-util.h"
#include "main-func.h"
#include "mkdir.h"
#include "os-util.h"
#include "parse-util.h"
@ -58,6 +59,14 @@ static bool arg_copy_keymap = false;
static bool arg_copy_timezone = false;
static bool arg_copy_root_password = false;
STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
STATIC_DESTRUCTOR_REGISTER(arg_locale, freep);
STATIC_DESTRUCTOR_REGISTER(arg_locale_messages, freep);
STATIC_DESTRUCTOR_REGISTER(arg_keymap, freep);
STATIC_DESTRUCTOR_REGISTER(arg_timezone, freep);
STATIC_DESTRUCTOR_REGISTER(arg_hostname, freep);
STATIC_DESTRUCTOR_REGISTER(arg_root_password, string_free_erasep);
static bool press_any_key(void) {
char k = 0;
bool need_nl = true;
@ -941,61 +950,49 @@ static int parse_argv(int argc, char *argv[]) {
return 1;
}
int main(int argc, char *argv[]) {
static int run(int argc, char *argv[]) {
bool enabled;
int r;
r = parse_argv(argc, argv);
if (r <= 0)
goto finish;
return r;
log_setup_service();
umask(0022);
r = proc_cmdline_get_bool("systemd.firstboot", &enabled);
if (r < 0) {
log_error_errno(r, "Failed to parse systemd.firstboot= kernel command line argument, ignoring: %m");
goto finish;
}
if (r > 0 && !enabled) {
r = 0; /* disabled */
goto finish;
}
if (r < 0)
return log_error_errno(r, "Failed to parse systemd.firstboot= kernel command line argument, ignoring: %m");
if (r > 0 && !enabled)
return 0; /* disabled */
r = process_locale();
if (r < 0)
goto finish;
return r;
r = process_keymap();
if (r < 0)
goto finish;
return r;
r = process_timezone();
if (r < 0)
goto finish;
return r;
r = process_hostname();
if (r < 0)
goto finish;
return r;
r = process_machine_id();
if (r < 0)
goto finish;
return r;
r = process_root_password();
if (r < 0)
goto finish;
return r;
finish:
free(arg_root);
free(arg_locale);
free(arg_locale_messages);
free(arg_keymap);
free(arg_timezone);
free(arg_hostname);
string_erase(arg_root_password);
free(arg_root_password);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
return 0;
}
DEFINE_MAIN_FUNCTION(run);