5caa3167ff
This renames find_esp() to find_esp_and_warn() and tries to normalize its behaviour: 1. Change the error that is returned when we can't find the ESP to ENOKEY (from ENOENT). This way the error code can only mean one thing: that our search loop didn't find a good candidate. 2. Really log about all errors, except for ENOKEY and EACCES, and document the letter cases. 3. Normalize parameters to the call: separate out the path parameter in two: an input path and an output path. That way the memory management is clear: we will access the input parameter only for reading, and only write out the output parameter, using malloc() memory. Before the calling convention were quire surprising for internal API code, as the path parameter had to be malloc() memory and might and might not have changed. 4. Rename bootctl's find_esp_warn() to acquire_esp(), and make it a simple wrapper around find_esp_warn(), that basically just adds the friendly logging for the ENOKEY case. This rework removes double logging in a number of error cases, as we no longer log here in anything but ENOKEY, and leave that entirely to find_esp_warn(). 5. find_esp_and_warn() now takes a bool flag parameter "unprivileged_mode", which disables logging in the EACCES case, and skips privileged validation of the path. This makes the function less magic, and doesn't hide this internal silencing automatism from the caller anymore. With all that in place "bootctl list" and "bootctl status" work properly (or as good as they can) when I invoke the tools whithout privileges on my system where /boot is not world-readable
65 lines
2 KiB
C
65 lines
2 KiB
C
/***
|
|
This file is part of systemd.
|
|
|
|
Copyright 2017 Zbigniew Jędrzejewski-Szmek
|
|
|
|
systemd is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU Lesser General Public License as published by
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
|
(at your option) any later version.
|
|
|
|
systemd is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
#pragma once
|
|
|
|
#include <stdlib.h>
|
|
|
|
typedef struct BootEntry {
|
|
char *filename;
|
|
|
|
char *title;
|
|
char *show_title;
|
|
char *version;
|
|
char *machine_id;
|
|
char *architecture;
|
|
char **options;
|
|
char *kernel; /* linux is #defined to 1, yikes! */
|
|
char *efi;
|
|
char **initrd;
|
|
char *device_tree;
|
|
} BootEntry;
|
|
|
|
typedef struct BootConfig {
|
|
char *default_pattern;
|
|
char *timeout;
|
|
char *editor;
|
|
|
|
char *entry_oneshot;
|
|
char *entry_default;
|
|
|
|
BootEntry *entries;
|
|
size_t n_entries;
|
|
ssize_t default_entry;
|
|
} BootConfig;
|
|
|
|
void boot_entry_free(BootEntry *entry);
|
|
int boot_entry_load(const char *path, BootEntry *entry);
|
|
int boot_entries_find(const char *dir, BootEntry **entries, size_t *n_entries);
|
|
|
|
int boot_loader_read_conf(const char *path, BootConfig *config);
|
|
void boot_config_free(BootConfig *config);
|
|
int boot_entries_load_config(const char *esp_path, BootConfig *config);
|
|
|
|
static inline const char* boot_entry_title(const BootEntry *entry) {
|
|
return entry->show_title ?: entry->title ?: entry->filename;
|
|
}
|
|
|
|
int find_esp_and_warn(const char *path, bool unprivileged_mode, char **ret_path, uint32_t *ret_part, uint64_t *ret_pstart, uint64_t *ret_psize, sd_id128_t *ret_uuid);
|