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

bootctl: tiny shortification

Browse source
This commit is contained in:
Lennart Poettering 2018-06-22 11:43:13 +02:00
parent e0e8d177c8
commit a36b411ea2
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/boot/bootctl.c
View file

@ -224,9 +224,8 @@ static int print_efi_option(uint16_t id, bool in_order) {
} }
static int status_variables(void) { static int status_variables(void) {
int n_options, n_order;
_cleanup_free_ uint16_t *options = NULL, *order = NULL; _cleanup_free_ uint16_t *options = NULL, *order = NULL;
int i; int n_options, n_order, i;
n_options = efi_get_boot_options(&options); n_options = efi_get_boot_options(&options);
if (n_options == -ENOENT) if (n_options == -ENOENT)
@ -806,9 +805,9 @@ static int install_loader_config(const char *esp_path) {
return log_oom(); return log_oom();
} }
fprintf(f, "#timeout 3\n"); fprintf(f, "#timeout 3\n"
fprintf(f, "#console-mode keep\n"); "#console-mode keep\n"
fprintf(f, "default %s-*\n", sd_id128_to_string(machine_id, machine_string)); "default %s-*\n", sd_id128_to_string(machine_id, machine_string));
r = fflush_sync_and_check(f); r = fflush_sync_and_check(f);
if (r < 0) if (r < 0)
@ -867,7 +866,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "path", required_argument, NULL, ARG_PATH }, { "path", required_argument, NULL, ARG_PATH },
{ "print-path", no_argument, NULL, 'p' }, { "print-path", no_argument, NULL, 'p' },
{ "no-variables", no_argument, NULL, ARG_NO_VARIABLES }, { "no-variables", no_argument, NULL, ARG_NO_VARIABLES },
{ NULL, 0, NULL, 0 } {}
}; };
int c, r; int c, r;