summaryrefslogtreecommitdiff
path: root/src/nspawn/nspawn-register.h
diff options
context:
space:
mode:
authorIago López Galeiras <iaguis@gmail.com>2015-11-09 11:32:34 +0100
committerIago López Galeiras <iaguis@gmail.com>2015-11-09 16:40:05 +0100
commit6aadfa4c5239f6cd2a80e82f6bc102cc116583df (patch)
treed38cfce939d81c7fcff857ef14234aa10c36c0b9 /src/nspawn/nspawn-register.h
parent2933d599c242ebfc70ddcffe59163916b02270f1 (diff)
nspawn: support custom container service name
We were hardcoding "systemd-nspawn" as the value of the $container env variable and "nspawn" as the service string in machined registration. This commit allows the user to configure it by setting the $SYSTEMD_NSPAWN_CONTAINER_SERVICE env variable when calling systemd-nspawn. If $SYSTEMD_NSPAWN_CONTAINER_SERVICE is not set, we use the string "systemd-nspawn" for both, fixing the previous inconsistency.
Diffstat (limited to 'src/nspawn/nspawn-register.h')
-rw-r--r--src/nspawn/nspawn-register.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-register.h b/src/nspawn/nspawn-register.h
index b27841ff59..d3bfd84e5e 100644
--- a/src/nspawn/nspawn-register.h
+++ b/src/nspawn/nspawn-register.h
@@ -27,5 +27,5 @@
#include "nspawn-mount.h"
-int register_machine(const char *machine_name, pid_t pid, const char *directory, sd_id128_t uuid, int local_ifindex, const char *slice, CustomMount *mounts, unsigned n_mounts, int kill_signal, char **properties, bool keep_unit);
+int register_machine(const char *machine_name, pid_t pid, const char *directory, sd_id128_t uuid, int local_ifindex, const char *slice, CustomMount *mounts, unsigned n_mounts, int kill_signal, char **properties, bool keep_unit, const char *service);
int terminate_machine(pid_t pid);