summaryrefslogtreecommitdiff
path: root/src/nspawn/nspawn.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-04-22 13:37:24 +0200
committerLennart Poettering <lennart@poettering.net>2012-04-22 14:11:32 +0200
commit0f0dbc46ccf5aaaf3131446d0a4d78bc97a37295 (patch)
treecbd6793a750014692ebb7cb2343b2cd255dd7c7c /src/nspawn/nspawn.c
parentacda6a054fb131dbab9b7b16e4148e05a03ce66b (diff)
nspawn: add -b switch to automatically look for an init binary
Diffstat (limited to 'src/nspawn/nspawn.c')
-rw-r--r--src/nspawn/nspawn.c29
1 files changed, 27 insertions, 2 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 50f2c59111..7050c05ec2 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -56,6 +56,7 @@ static char *arg_directory = NULL;
static char *arg_user = NULL;
static char **arg_controllers = NULL;
static bool arg_private_network = false;
+static bool arg_boot = false;
static int help(void) {
@@ -63,6 +64,7 @@ static int help(void) {
"Spawn a minimal namespace container for debugging, testing and building.\n\n"
" -h --help Show this help\n"
" -D --directory=NAME Root directory for the container\n"
+ " -b --boot Boot up full system (i.e. invoke init)\n"
" -u --user=USER Run the command under specified user or uid\n"
" -C --controllers=LIST Put the container in specified comma-separated cgroup hierarchies\n"
" --private-network Disable network in container\n",
@@ -83,6 +85,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "user", required_argument, NULL, 'u' },
{ "controllers", required_argument, NULL, 'C' },
{ "private-network", no_argument, NULL, ARG_PRIVATE_NETWORK },
+ { "boot", no_argument, NULL, 'b' },
{ NULL, 0, NULL, 0 }
};
@@ -91,7 +94,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "+hD:u:C:", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "+hD:u:C:b", options, NULL)) >= 0) {
switch (c) {
@@ -133,6 +136,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_private_network = true;
break;
+ case 'b':
+ arg_boot = true;
+ break;
+
case '?':
return -EINVAL;
@@ -1024,7 +1031,25 @@ int main(int argc, char *argv[]) {
setup_hostname();
- if (argc > optind)
+ if (arg_boot) {
+ char **a;
+ size_t l;
+
+ /* Automatically search for the init system */
+
+ l = 1 + argc - optind;
+ a = newa(char*, l + 1);
+ memcpy(a + 1, argv + optind, l * sizeof(char*));
+
+ a[0] = (char*) "/usr/lib/systemd/systemd";
+ execve(a[0], a, (char**) envp);
+
+ a[0] = (char*) "/lib/systemd/systemd";
+ execve(a[0], a, (char**) envp);
+
+ a[0] = (char*) "/sbin/init";
+ execve(a[0], a, (char**) envp);
+ } else if (argc > optind)
execvpe(argv[optind], argv + optind, (char**) envp);
else {
chdir(home ? home : "/root");