bootctl: split-out entry token related definitions into boot-entry.[ch]
No functional change, just preparation for later commits. These can be used in kernel-install later. Note, unlike the our usual coding style, the arguments for boot_entry_token_ensure() and parse_boot_entry_token_type() are referenced, updated, and may freed, hence, always pass initialized values. That's why they are not named as 'ret_xyz'.
This commit is contained in:
Yu Watanabe
committed by
Zbigniew Jędrzejewski-Szmek
Zbigniew Jędrzejewski-Szmek
parent
600362aa11
commit
9e43296fd2
@@ -133,7 +133,7 @@ static int settle_make_entry_directory(void) {
|
||||
bool layout_type1 = use_boot_loader_spec_type1();
|
||||
if (arg_make_entry_directory < 0) { /* Automatic mode */
|
||||
if (layout_type1) {
|
||||
if (arg_entry_token_type == ARG_ENTRY_TOKEN_MACHINE_ID) {
|
||||
if (arg_entry_token_type == BOOT_ENTRY_TOKEN_MACHINE_ID) {
|
||||
r = path_is_temporary_fs("/etc/machine-id");
|
||||
if (r < 0)
|
||||
return log_debug_errno(r, "Couldn't determine whether /etc/machine-id is on a temporary file system: %m");
|
||||
@@ -510,7 +510,7 @@ static int install_entry_token(void) {
|
||||
/* Let's save the used entry token in /etc/kernel/entry-token if we used it to create the entry
|
||||
* directory, or if anything else but the machine ID */
|
||||
|
||||
if (!arg_make_entry_directory && arg_entry_token_type == ARG_ENTRY_TOKEN_MACHINE_ID)
|
||||
if (!arg_make_entry_directory && arg_entry_token_type == BOOT_ENTRY_TOKEN_MACHINE_ID)
|
||||
return 0;
|
||||
|
||||
p = path_join(arg_root, etc_kernel(), "entry-token");
|
||||
|
||||
+8
-90
@@ -5,11 +5,8 @@
|
||||
#include "bootctl.h"
|
||||
#include "bootctl-util.h"
|
||||
#include "fileio.h"
|
||||
#include "os-util.h"
|
||||
#include "path-util.h"
|
||||
#include "stat-util.h"
|
||||
#include "sync-util.h"
|
||||
#include "utf8.h"
|
||||
|
||||
int sync_everything(void) {
|
||||
int ret = 0, k;
|
||||
@@ -118,93 +115,14 @@ finish:
|
||||
int settle_entry_token(void) {
|
||||
int r;
|
||||
|
||||
switch (arg_entry_token_type) {
|
||||
|
||||
case ARG_ENTRY_TOKEN_AUTO: {
|
||||
_cleanup_free_ char *buf = NULL, *p = NULL;
|
||||
p = path_join(arg_root, etc_kernel(), "entry-token");
|
||||
if (!p)
|
||||
return log_oom();
|
||||
r = read_one_line_file(p, &buf);
|
||||
if (r < 0 && r != -ENOENT)
|
||||
return log_error_errno(r, "Failed to read %s: %m", p);
|
||||
|
||||
if (!isempty(buf)) {
|
||||
free_and_replace(arg_entry_token, buf);
|
||||
arg_entry_token_type = ARG_ENTRY_TOKEN_LITERAL;
|
||||
} else if (sd_id128_is_null(arg_machine_id)) {
|
||||
_cleanup_free_ char *id = NULL, *image_id = NULL;
|
||||
|
||||
r = parse_os_release(arg_root,
|
||||
"IMAGE_ID", &image_id,
|
||||
"ID", &id);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to load /etc/os-release: %m");
|
||||
|
||||
if (!isempty(image_id)) {
|
||||
free_and_replace(arg_entry_token, image_id);
|
||||
arg_entry_token_type = ARG_ENTRY_TOKEN_OS_IMAGE_ID;
|
||||
} else if (!isempty(id)) {
|
||||
free_and_replace(arg_entry_token, id);
|
||||
arg_entry_token_type = ARG_ENTRY_TOKEN_OS_ID;
|
||||
} else
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "No machine ID set, and /etc/os-release carries no ID=/IMAGE_ID= fields.");
|
||||
} else {
|
||||
r = free_and_strdup_warn(&arg_entry_token, SD_ID128_TO_STRING(arg_machine_id));
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
arg_entry_token_type = ARG_ENTRY_TOKEN_MACHINE_ID;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case ARG_ENTRY_TOKEN_MACHINE_ID:
|
||||
if (sd_id128_is_null(arg_machine_id))
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "No machine ID set.");
|
||||
|
||||
r = free_and_strdup_warn(&arg_entry_token, SD_ID128_TO_STRING(arg_machine_id));
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
break;
|
||||
|
||||
case ARG_ENTRY_TOKEN_OS_IMAGE_ID: {
|
||||
_cleanup_free_ char *buf = NULL;
|
||||
|
||||
r = parse_os_release(arg_root, "IMAGE_ID", &buf);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to load /etc/os-release: %m");
|
||||
|
||||
if (isempty(buf))
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "IMAGE_ID= field not set in /etc/os-release.");
|
||||
|
||||
free_and_replace(arg_entry_token, buf);
|
||||
break;
|
||||
}
|
||||
|
||||
case ARG_ENTRY_TOKEN_OS_ID: {
|
||||
_cleanup_free_ char *buf = NULL;
|
||||
|
||||
r = parse_os_release(arg_root, "ID", &buf);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to load /etc/os-release: %m");
|
||||
|
||||
if (isempty(buf))
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "ID= field not set in /etc/os-release.");
|
||||
|
||||
free_and_replace(arg_entry_token, buf);
|
||||
break;
|
||||
}
|
||||
|
||||
case ARG_ENTRY_TOKEN_LITERAL:
|
||||
assert(!isempty(arg_entry_token)); /* already filled in by command line parser */
|
||||
break;
|
||||
}
|
||||
|
||||
if (isempty(arg_entry_token) || !(utf8_is_valid(arg_entry_token) && string_is_safe(arg_entry_token)))
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Selected entry token not valid: %s", arg_entry_token);
|
||||
r = boot_entry_token_ensure(
|
||||
arg_root,
|
||||
etc_kernel(),
|
||||
arg_machine_id,
|
||||
&arg_entry_token_type,
|
||||
&arg_entry_token);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
log_debug("Using entry token: %s", arg_entry_token);
|
||||
return 0;
|
||||
|
||||
+5
-24
@@ -43,7 +43,7 @@ bool arg_quiet = false;
|
||||
int arg_make_entry_directory = false; /* tri-state: < 0 for automatic logic */
|
||||
sd_id128_t arg_machine_id = SD_ID128_NULL;
|
||||
char *arg_install_layout = NULL;
|
||||
EntryTokenType arg_entry_token_type = ARG_ENTRY_TOKEN_AUTO;
|
||||
BootEntryTokenType arg_entry_token_type = BOOT_ENTRY_TOKEN_AUTO;
|
||||
char *arg_entry_token = NULL;
|
||||
JsonFormatFlags arg_json_format_flags = JSON_FORMAT_OFF;
|
||||
bool arg_arch_all = false;
|
||||
@@ -328,30 +328,11 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
arg_quiet = true;
|
||||
break;
|
||||
|
||||
case ARG_ENTRY_TOKEN: {
|
||||
const char *e;
|
||||
|
||||
if (streq(optarg, "machine-id")) {
|
||||
arg_entry_token_type = ARG_ENTRY_TOKEN_MACHINE_ID;
|
||||
arg_entry_token = mfree(arg_entry_token);
|
||||
} else if (streq(optarg, "os-image-id")) {
|
||||
arg_entry_token_type = ARG_ENTRY_TOKEN_OS_IMAGE_ID;
|
||||
arg_entry_token = mfree(arg_entry_token);
|
||||
} else if (streq(optarg, "os-id")) {
|
||||
arg_entry_token_type = ARG_ENTRY_TOKEN_OS_ID;
|
||||
arg_entry_token = mfree(arg_entry_token);
|
||||
} else if ((e = startswith(optarg, "literal:"))) {
|
||||
arg_entry_token_type = ARG_ENTRY_TOKEN_LITERAL;
|
||||
|
||||
r = free_and_strdup_warn(&arg_entry_token, e);
|
||||
if (r < 0)
|
||||
return r;
|
||||
} else
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
|
||||
"Unexpected parameter for --entry-token=: %s", optarg);
|
||||
|
||||
case ARG_ENTRY_TOKEN:
|
||||
r = parse_boot_entry_token_type(optarg, &arg_entry_token_type, &arg_entry_token);
|
||||
if (r < 0)
|
||||
return r;
|
||||
break;
|
||||
}
|
||||
|
||||
case ARG_MAKE_ENTRY_DIRECTORY:
|
||||
if (streq(optarg, "auto")) /* retained for backwards compatibility */
|
||||
|
||||
+2
-9
@@ -3,17 +3,10 @@
|
||||
|
||||
#include "sd-id128.h"
|
||||
|
||||
#include "boot-entry.h"
|
||||
#include "json.h"
|
||||
#include "pager.h"
|
||||
|
||||
typedef enum EntryTokenType {
|
||||
ARG_ENTRY_TOKEN_MACHINE_ID,
|
||||
ARG_ENTRY_TOKEN_OS_IMAGE_ID,
|
||||
ARG_ENTRY_TOKEN_OS_ID,
|
||||
ARG_ENTRY_TOKEN_LITERAL,
|
||||
ARG_ENTRY_TOKEN_AUTO,
|
||||
} EntryTokenType;
|
||||
|
||||
typedef enum InstallSource {
|
||||
ARG_INSTALL_SOURCE_IMAGE,
|
||||
ARG_INSTALL_SOURCE_HOST,
|
||||
@@ -32,7 +25,7 @@ extern bool arg_quiet;
|
||||
extern int arg_make_entry_directory; /* tri-state: < 0 for automatic logic */
|
||||
extern sd_id128_t arg_machine_id;
|
||||
extern char *arg_install_layout;
|
||||
extern EntryTokenType arg_entry_token_type;
|
||||
extern BootEntryTokenType arg_entry_token_type;
|
||||
extern char *arg_entry_token;
|
||||
extern JsonFormatFlags arg_json_format_flags;
|
||||
extern bool arg_arch_all;
|
||||
|
||||
Reference in New Issue
Block a user