SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

units: add an easy-to-use unit template file systemd-nspawn@.service for running containers as system services

Browse Source
This commit is contained in:
Lennart Poettering
2013-04-30 08:36:02 -03:00
parent 0df2d38abf
commit 05947befce
4 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn.c
+12 -6
View File
@@ -1231,9 +1231,13 @@ int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
r = parse_argv(argc, argv);
if (r <= 0)
k = parse_argv(argc, argv);
if (k < 0)
goto finish;
else if (k == 0) {
r = EXIT_SUCCESS;
goto finish;
}
if (arg_directory) {
char *p;
@@ -1321,8 +1325,8 @@ int main(int argc, char *argv[]) {
goto finish;
}
r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, newcg, false);
if (r <= 0 && r != -ENOENT) {
k = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, newcg, true);
if (k <= 0 && k != -ENOENT) {
log_error("Container already running.");
free(newcg);
@@ -1366,6 +1370,8 @@ int main(int argc, char *argv[]) {
goto finish;
}
sd_notify(0, "READY=1");
assert_se(sigemptyset(&mask) == 0);
sigset_add_many(&mask, SIGCHLD, SIGWINCH, SIGTERM, SIGINT, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
@@ -1701,8 +1707,8 @@ int main(int argc, char *argv[]) {
if (saved_attr_valid)
tcsetattr(STDIN_FILENO, TCSANOW, &saved_attr);
r = wait_for_terminate(pid, &status);
if (r < 0) {
k = wait_for_terminate(pid, &status);
if (k < 0) {
r = EXIT_FAILURE;
break;
}