Attachment 59804 Details for Bug 48510 – With STRV_FOREACH

[patch] With STRV_FOREACH

0001-One-can-specify-in-which-cgroup-hierarchies-a-system.patch (text/plain), 4.75 KB, created by Léo Gillot-Lamure on 2012-04-11 06:14:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Léo Gillot-Lamure

Created: 2012-04-11 06:14:36 UTC

Size: 4.75 KB

patch

obsolete

>From 44dbe83d6640bf1150f1528f197db5d7eddb8235 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?L=C3=A9o=20Gillot-Lamure?= <leo.gillot@navaati.net>
>Date: Wed, 11 Apr 2012 12:27:19 +0100
>Subject: [PATCH] One can specify in which cgroup hierarchies a systemd-nspawn
> container will appear
>
>---
> man/systemd-nspawn.xml |   10 ++++++++++
> src/nspawn.c           |   27 +++++++++++++++++++++++----
> 2 files changed, 33 insertions(+), 4 deletions(-)
>
>diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
>index dbd2ff5..47aa4a7 100644
>--- a/man/systemd-nspawn.xml
>+++ b/man/systemd-nspawn.xml
>@@ -155,6 +155,16 @@
>                         </varlistentry>
> 
>                         <varlistentry>
>+                                <term><option>--controllers=</option></term>
>+                                <term><option>-C</option></term>
>+
>+                                <listitem><para>Makes the container appear in
>+                                other hierarchies that the name=systemd:/ one.
>+                                Takes a comma-separated list of controllers.
>+                                </para></listitem>
>+                        </varlistentry>
>+
>+                        <varlistentry>
>                                 <term><option>--private-network</option></term>
> 
>                                 <listitem><para>Turn off networking in
>diff --git a/src/nspawn.c b/src/nspawn.c
>index 6f5a9d9..68e27a5 100644
>--- a/src/nspawn.c
>+++ b/src/nspawn.c
>@@ -50,6 +50,7 @@
> 
> static char *arg_directory = NULL;
> static char *arg_user = NULL;
>+static char **arg_controllers = NULL;
> static bool arg_private_network = false;
> 
> static int help(void) {
>@@ -59,6 +60,7 @@ static int help(void) {
>                "  -h --help            Show this help\n"
>                "  -D --directory=NAME  Root directory for the container\n"
>                "  -u --user=USER       Run the command under specified user or uid\n"
>+               "  -C --controllers=CON Put the container in specified comma-separated cgroup hierarchies\n"
>                "     --private-network Disable network in container\n",
>                program_invocation_short_name);
> 
>@@ -75,6 +77,7 @@ static int parse_argv(int argc, char *argv[]) {
>                 { "help",            no_argument,       NULL, 'h'                 },
>                 { "directory",       required_argument, NULL, 'D'                 },
>                 { "user",            required_argument, NULL, 'u'                 },
>+                { "controllers",     required_argument, NULL, 'C'                 },
>                 { "private-network", no_argument,       NULL, ARG_PRIVATE_NETWORK },
>                 { NULL,              0,                 NULL, 0                   }
>         };
>@@ -84,7 +87,7 @@ static int parse_argv(int argc, char *argv[]) {
>         assert(argc >= 0);
>         assert(argv);
> 
>-        while ((c = getopt_long(argc, argv, "+hD:u:", options, NULL)) >= 0) {
>+        while ((c = getopt_long(argc, argv, "+hD:u:C:", options, NULL)) >= 0) {
> 
>                 switch (c) {
> 
>@@ -110,6 +113,15 @@ static int parse_argv(int argc, char *argv[]) {
> 
>                         break;
> 
>+                case 'C':
>+                        free(arg_controllers);
>+                        if (!(arg_controllers = strv_uniq(strv_split(optarg, ",")))) {
>+                                log_error("Failed to split controllers list.");
>+                                return -ENOMEM;
>+                        }
>+
>+                        break;
>+
>                 case ARG_PRIVATE_NETWORK:
>                         arg_private_network = true;
>                         break;
>@@ -610,6 +622,8 @@ int main(int argc, char *argv[]) {
>         pid_t pid = 0;
>         int r = EXIT_FAILURE, k;
>         char *oldcg = NULL, *newcg = NULL;
>+        char **controllers = NULL;
>+        char **controller = NULL;
>         int master = -1;
>         const char *console = NULL;
>         struct termios saved_attr, raw_attr;
>@@ -669,10 +683,15 @@ int main(int argc, char *argv[]) {
>                 goto finish;
>         }
> 
>-        if ((k = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, newcg, 0)) < 0)  {
>-                log_error("Failed to create cgroup: %s", strerror(-k));
>-                goto finish;
>+        controllers = strv_append(arg_controllers, SYSTEMD_CGROUP_CONTROLLER);
>+        strv_free(arg_controllers);
>+        STRV_FOREACH(controller,controllers) {
>+                if ((k = cg_create_and_attach(*controller, newcg, 0)) < 0)  {
>+                        log_error("Failed to create cgroup: %s", strerror(-k));
>+                        goto finish;
>+                }
>         }
>+        strv_free(controllers);
> 
>         if ((master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY)) < 0) {
>                 log_error("Failed to acquire pseudo tty: %m");
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 48510: 59801 | 59804 | 59805

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.