9c1e04d0fa
This the patch implements a notificaiton mechanism from the init process in the container to systemd-nspawn. The switch --notify-ready=yes configures systemd-nspawn to wait the "READY=1" message from the init process in the container to send its own to systemd. --notify-ready=no is equivalent to the previous behavior before this patch, systemd-nspawn notifies systemd with a "READY=1" message when the container is created. This notificaiton mechanism uses socket file with path relative to the contanier "/run/systemd/nspawn/notify". The default values it --notify-ready=no. It is also possible to configure this mechanism from the .nspawn files using NotifyReady. This parameter takes the same options of the command line switch. Before this patch, systemd-nspawn notifies "ready" after the inner child was created, regardless the status of the service running inside it. Now, with --notify-ready=yes, systemd-nspawn notifies when the service is ready. This is really useful when there are dependencies between different contaniers. Fixes https://github.com/systemd/systemd/issues/1369 Based on the work from https://github.com/systemd/systemd/pull/3022 Testing: Boot a OS inside a container with systemd-nspawn. Note: modify the commands accordingly with your filesystem. 1. Create a filesystem where you can boot an OS. 2. sudo systemd-nspawn -D ${HOME}/distros/fedora-23/ sh 2.1. Create the unit file /etc/systemd/system/sleep.service inside the container (You can use the example below) 2.2. systemdctl enable sleep 2.3 exit 3. sudo systemd-run --service-type=notify --unit=notify-test ${HOME}/systemd/systemd-nspawn --notify-ready=yes -D ${HOME}/distros/fedora-23/ -b 4. In a different shell run "systemctl status notify-test" When using --notify-ready=yes the service status is "activating" for 20 seconds before being set to "active (running)". Instead, using --notify-ready=no the service status is marked "active (running)" quickly, without waiting for the 20 seconds. This patch was also test with --private-users=yes, you can test it just adding it at the end of the command at point 3. ------ sleep.service ------ [Unit] Description=sleep After=network.target [Service] Type=oneshot ExecStart=/bin/sleep 20 [Install] WantedBy=multi-user.target ------------ end ------------
119 lines
5.5 KiB
C
119 lines
5.5 KiB
C
#pragma once
|
|
|
|
/***
|
|
This file is part of systemd.
|
|
|
|
Copyright 2015 Lennart Poettering
|
|
|
|
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/>.
|
|
***/
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "macro.h"
|
|
#include "nspawn-expose-ports.h"
|
|
#include "nspawn-mount.h"
|
|
|
|
typedef enum StartMode {
|
|
START_PID1, /* Run parameters as command line as process 1 */
|
|
START_PID2, /* Use stub init process as PID 1, run parameters as command line as process 2 */
|
|
START_BOOT, /* Search for init system, pass arguments as parameters */
|
|
_START_MODE_MAX,
|
|
_START_MODE_INVALID = -1
|
|
} StartMode;
|
|
|
|
typedef enum UserNamespaceMode {
|
|
USER_NAMESPACE_NO,
|
|
USER_NAMESPACE_FIXED,
|
|
USER_NAMESPACE_PICK,
|
|
_USER_NAMESPACE_MODE_MAX,
|
|
_USER_NAMESPACE_MODE_INVALID = -1,
|
|
} UserNamespaceMode;
|
|
|
|
typedef enum SettingsMask {
|
|
SETTING_START_MODE = 1 << 0,
|
|
SETTING_ENVIRONMENT = 1 << 1,
|
|
SETTING_USER = 1 << 2,
|
|
SETTING_CAPABILITY = 1 << 3,
|
|
SETTING_KILL_SIGNAL = 1 << 4,
|
|
SETTING_PERSONALITY = 1 << 5,
|
|
SETTING_MACHINE_ID = 1 << 6,
|
|
SETTING_NETWORK = 1 << 7,
|
|
SETTING_EXPOSE_PORTS = 1 << 8,
|
|
SETTING_READ_ONLY = 1 << 9,
|
|
SETTING_VOLATILE_MODE = 1 << 10,
|
|
SETTING_CUSTOM_MOUNTS = 1 << 11,
|
|
SETTING_WORKING_DIRECTORY = 1 << 12,
|
|
SETTING_USERNS = 1 << 13,
|
|
SETTING_NOTIFY_READY = 1 << 14,
|
|
_SETTINGS_MASK_ALL = (1 << 15) -1
|
|
} SettingsMask;
|
|
|
|
typedef struct Settings {
|
|
/* [Run] */
|
|
StartMode start_mode;
|
|
char **parameters;
|
|
char **environment;
|
|
char *user;
|
|
uint64_t capability;
|
|
uint64_t drop_capability;
|
|
int kill_signal;
|
|
unsigned long personality;
|
|
sd_id128_t machine_id;
|
|
char *working_directory;
|
|
UserNamespaceMode userns_mode;
|
|
uid_t uid_shift, uid_range;
|
|
bool notify_ready;
|
|
|
|
/* [Image] */
|
|
int read_only;
|
|
VolatileMode volatile_mode;
|
|
CustomMount *custom_mounts;
|
|
unsigned n_custom_mounts;
|
|
int userns_chown;
|
|
|
|
/* [Network] */
|
|
int private_network;
|
|
int network_veth;
|
|
char *network_bridge;
|
|
char *network_zone;
|
|
char **network_interfaces;
|
|
char **network_macvlan;
|
|
char **network_ipvlan;
|
|
char **network_veth_extra;
|
|
ExposePort *expose_ports;
|
|
} Settings;
|
|
|
|
int settings_load(FILE *f, const char *path, Settings **ret);
|
|
Settings* settings_free(Settings *s);
|
|
|
|
bool settings_network_veth(Settings *s);
|
|
bool settings_private_network(Settings *s);
|
|
|
|
DEFINE_TRIVIAL_CLEANUP_FUNC(Settings*, settings_free);
|
|
|
|
const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, unsigned length);
|
|
|
|
int config_parse_capability(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
|
int config_parse_id128(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
|
int config_parse_expose_port(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
|
int config_parse_volatile_mode(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
|
int config_parse_bind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
|
int config_parse_tmpfs(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
|
int config_parse_veth_extra(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
|
int config_parse_network_zone(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
|
int config_parse_boot(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
|
int config_parse_pid2(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
|
int config_parse_private_users(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|