shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-25 21:57:32 +03:00
Code

machinectl: support vmspawn as a backend

Browse Source
This commit is contained in:
Sam Leonard 2024-02-20 13:14:52 +00:00
parent b0dc766852
commit f82dcc3fc3
No known key found for this signature in database
GPG Key ID: 96850F0978CE78F0
2 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
man/machinectl.xml
View File

@ -887,6 +887,24 @@
<xi:include href="version-info.xml" xpointer="v219"/></listitem> <xi:include href="version-info.xml" xpointer="v219"/></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><option>-V</option></term>
<term><option>--runner=</option><option>nspawn</option>|<option>vmspawn</option></term>
<listitem><para>When operating on machines choose whether to use
<citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>
or
<citerefentry><refentrytitle>systemd-vmspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
By default
<citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>
is used.
</para>
<para><option>-V</option> is a shorthand for <option>--runner=vmspawn</option>.</para>
<xi:include href="version-info.xml" xpointer="v256"/></listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><option>--now</option></term> <term><option>--now</option></term>

52
src/machine/machinectl.c
View File

@ -62,6 +62,25 @@
#include "verbs.h" #include "verbs.h"
#include "web-util.h" #include "web-util.h"
typedef enum MachineRunner {
RUNNER_NSPAWN,
RUNNER_VMSPAWN,
_RUNNER_MAX,
_RUNNER_INVALID = -EINVAL,
} MachineRunner;
static const char* const machine_runner_table[_RUNNER_MAX] = {
[RUNNER_NSPAWN] = "nspawn",
[RUNNER_VMSPAWN] = "vmspawn",
};
DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING(machine_runner, MachineRunner);
static const char* const machine_runner_unit_prefix_table[_RUNNER_MAX] = {
[RUNNER_NSPAWN] = "systemd-nspawn",
[RUNNER_VMSPAWN] = "systemd-vmspawn",
};
static char **arg_property = NULL; static char **arg_property = NULL;
static bool arg_all = false; static bool arg_all = false;
static BusPrintPropertyFlags arg_print_flags = 0; static BusPrintPropertyFlags arg_print_flags = 0;
@ -81,6 +100,7 @@ static OutputMode arg_output = OUTPUT_SHORT;
static bool arg_now = false; static bool arg_now = false;
static bool arg_force = false; static bool arg_force = false;
static ImportVerify arg_verify = IMPORT_VERIFY_SIGNATURE; static ImportVerify arg_verify = IMPORT_VERIFY_SIGNATURE;
static MachineRunner arg_runner = RUNNER_NSPAWN;
static const char* arg_format = NULL; static const char* arg_format = NULL;
static const char *arg_uid = NULL; static const char *arg_uid = NULL;
static char **arg_setenv = NULL; static char **arg_setenv = NULL;
@ -1052,6 +1072,12 @@ static int kill_machine(int argc, char *argv[], void *userdata) {
} }
static int reboot_machine(int argc, char *argv[], void *userdata) { static int reboot_machine(int argc, char *argv[], void *userdata) {
if (arg_runner == RUNNER_VMSPAWN)
return log_error_errno(
SYNTHETIC_ERRNO(EOPNOTSUPP),
"%s only support supported for --runner=nspawn",
streq(argv[0], "reboot") ? "Reboot" : "Restart");
arg_kill_whom = "leader"; arg_kill_whom = "leader";
arg_signal = SIGINT; /* sysvinit + systemd */ arg_signal = SIGINT; /* sysvinit + systemd */
@ -1462,6 +1488,9 @@ static int edit_settings(int argc, char *argv[], void *userdata) {
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"Edit is only supported on the host machine."); "Edit is only supported on the host machine.");
if (arg_runner == RUNNER_VMSPAWN)
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Edit is only supported for --runner=nspawn");
r = mac_init(); r = mac_init();
if (r < 0) if (r < 0)
return r; return r;
@ -1525,6 +1554,9 @@ static int cat_settings(int argc, char *argv[], void *userdata) {
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"Cat is only supported on the host machine."); "Cat is only supported on the host machine.");
if (arg_runner == RUNNER_VMSPAWN)
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Cat is only supported for --runner=nspawn");
pager_open(arg_pager_flags); pager_open(arg_pager_flags);
STRV_FOREACH(name, strv_skip(argv, 1)) { STRV_FOREACH(name, strv_skip(argv, 1)) {
@ -1682,12 +1714,13 @@ static int make_service_name(const char *name, char **ret) {
assert(name); assert(name);
assert(ret); assert(ret);
assert(arg_runner >= 0 && arg_runner < (MachineRunner) ELEMENTSOF(machine_runner_unit_prefix_table));
if (!hostname_is_valid(name, 0)) if (!hostname_is_valid(name, 0))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Invalid machine name %s.", name); "Invalid machine name %s.", name);
r = unit_name_build("systemd-nspawn", name, ".service", ret); r = unit_name_build(machine_runner_unit_prefix_table[arg_runner], name, ".service", ret);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to build unit name: %m"); return log_error_errno(r, "Failed to build unit name: %m");
@ -2642,6 +2675,7 @@ static int help(int argc, char *argv[], void *userdata) {
" --force Download image even if already exists\n" " --force Download image even if already exists\n"
" --now Start or power off container after enabling or\n" " --now Start or power off container after enabling or\n"
" disabling it\n" " disabling it\n"
" --runner=RUNNER Select between nspawn and vmspawn as the runner\n"
"\nSee the %2$s for details.\n", "\nSee the %2$s for details.\n",
program_invocation_short_name, program_invocation_short_name,
link, link,
@ -2665,6 +2699,7 @@ static int parse_argv(int argc, char *argv[]) {
ARG_MKDIR, ARG_MKDIR,
ARG_NO_ASK_PASSWORD, ARG_NO_ASK_PASSWORD,
ARG_VERIFY, ARG_VERIFY,
ARG_RUNNER,
ARG_NOW, ARG_NOW,
ARG_FORCE, ARG_FORCE,
ARG_FORMAT, ARG_FORMAT,
@ -2692,6 +2727,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "output", required_argument, NULL, 'o' }, { "output", required_argument, NULL, 'o' },
{ "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD }, { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD },
{ "verify", required_argument, NULL, ARG_VERIFY }, { "verify", required_argument, NULL, ARG_VERIFY },
{ "runner", required_argument, NULL, ARG_RUNNER },
{ "now", no_argument, NULL, ARG_NOW }, { "now", no_argument, NULL, ARG_NOW },
{ "force", no_argument, NULL, ARG_FORCE }, { "force", no_argument, NULL, ARG_FORCE },
{ "format", required_argument, NULL, ARG_FORMAT }, { "format", required_argument, NULL, ARG_FORMAT },
@ -2712,7 +2748,7 @@ static int parse_argv(int argc, char *argv[]) {
optind = 0; optind = 0;
for (;;) { for (;;) {
static const char option_string[] = "-hp:als:H:M:qn:o:E:"; static const char option_string[] = "-hp:als:H:M:qn:o:E:V";
c = getopt_long(argc, argv, option_string + reorder, options, NULL); c = getopt_long(argc, argv, option_string + reorder, options, NULL);
if (c < 0) if (c < 0)
@ -2873,6 +2909,18 @@ static int parse_argv(int argc, char *argv[]) {
arg_verify = r; arg_verify = r;
break; break;
case 'V':
arg_runner = RUNNER_VMSPAWN;
break;
case ARG_RUNNER:
r = machine_runner_from_string(optarg);
if (r < 0)
return log_error_errno(r, "Failed to parse --runner= setting: %s", optarg);
arg_runner = r;
break;
case ARG_NOW: case ARG_NOW:
arg_now = true; arg_now = true;
break; break;