picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn: port to main-func.h logic

Browse source
This commit is contained in:
Lennart Poettering 2019-03-21 13:35:45 +01:00
parent fa28e4e377
commit 44dbef90f1
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/nspawn/nspawn.c
View file

@ -57,6 +57,7 @@
#include "loopback-setup.h"
#include "machine-image.h"
#include "macro.h"
#include "main-func.h"
#include "missing.h"
#include "mkdir.h"
#include "mount-util.h"
@ -4019,7 +4020,7 @@ static int load_oci_bundle(void) {
return merge_settings(settings, arg_oci_bundle);
}
static int run(int master,
static int run_container(int master,
const char* console,
DissectedImage *dissected_image,
bool secondary,
@ -4607,7 +4608,7 @@ static int initialize_rlimits(void) {
return 0;
}
int main(int argc, char *argv[]) {
static int run(int argc, char *argv[]) {
_cleanup_free_ char *console = NULL;
_cleanup_close_ int master = -1;
_cleanup_fdset_free_ FDSet *fds = NULL;
@ -4964,14 +4965,14 @@ int main(int argc, char *argv[]) {
}
for (;;) {
r = run(master,
console,
dissected_image,
secondary,
fds,
veth_name, &veth_created,
&exposed,
&pid, &ret);
r = run_container(master,
console,
dissected_image,
secondary,
fds,
veth_name, &veth_created,
&exposed,
&pid, &ret);
if (r <= 0)
break;
}
@ -5062,5 +5063,10 @@ finish:
strv_free(arg_sysctl);
free(arg_slice);
return r < 0 ? EXIT_FAILURE : ret;
if (r < 0)
return r;
return ret;
}
DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);