manager: hook up IP accounting defaults

diff --git a/src/core/main.c b/src/core/main.c
index fbf8876a2de02f155cbc24c6f7b2a1e2d5203987..8660a31a2dda087f5fea62b10008798e555354ea 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -128,6 +128,7 @@ static Set* arg_syscall_archs = NULL;
 static FILE* arg_serialization = NULL;
 static bool arg_default_cpu_accounting = false;
 static bool arg_default_io_accounting = false;
+static bool arg_default_ip_accounting = false;
 static bool arg_default_blockio_accounting = false;
 static bool arg_default_memory_accounting = false;
 static bool arg_default_tasks_accounting = true;
@@ -748,6 +749,7 @@ static int parse_config_file(void) {
                 { "Manager", "DefaultLimitRTTIME",        config_parse_limit,            RLIMIT_RTTIME, arg_default_rlimit         },
                 { "Manager", "DefaultCPUAccounting",      config_parse_bool,             0, &arg_default_cpu_accounting            },
                 { "Manager", "DefaultIOAccounting",       config_parse_bool,             0, &arg_default_io_accounting             },
+                { "Manager", "DefaultIPAccounting",       config_parse_bool,             0, &arg_default_ip_accounting             },
                 { "Manager", "DefaultBlockIOAccounting",  config_parse_bool,             0, &arg_default_blockio_accounting        },
                 { "Manager", "DefaultMemoryAccounting",   config_parse_bool,             0, &arg_default_memory_accounting         },
                 { "Manager", "DefaultTasksAccounting",    config_parse_bool,             0, &arg_default_tasks_accounting          },
@@ -792,6 +794,7 @@ static void manager_set_defaults(Manager *m) {
         m->default_start_limit_burst = arg_default_start_limit_burst;
         m->default_cpu_accounting = arg_default_cpu_accounting;
         m->default_io_accounting = arg_default_io_accounting;
+        m->default_ip_accounting = arg_default_ip_accounting;
         m->default_blockio_accounting = arg_default_blockio_accounting;
         m->default_memory_accounting = arg_default_memory_accounting;
         m->default_tasks_accounting = arg_default_tasks_accounting;

diff --git a/src/core/manager.h b/src/core/manager.h
index 8880b3aab53abe001e3543996499e96a0c3089f5..e8a62674711b758dc6776f5b358ea94394d7e042 100644 (file)
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -272,6 +272,7 @@ struct Manager {
         bool default_io_accounting;
         bool default_blockio_accounting;
         bool default_tasks_accounting;
+        bool default_ip_accounting;
 
         uint64_t default_tasks_max;
         usec_t default_timer_accuracy_usec;

diff --git a/src/core/system.conf b/src/core/system.conf
index 88f646e2fe131f154d853d24af712377d2952266..6b86eac33db0005ce6f0b64267e5da4f43be40a7 100644 (file)
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -40,6 +40,7 @@
 #DefaultEnvironment=
 #DefaultCPUAccounting=no
 #DefaultIOAccounting=no
+#DefaultIPAccounting=no
 #DefaultBlockIOAccounting=no
 #DefaultMemoryAccounting=no
 #DefaultTasksAccounting=yes

diff --git a/src/core/unit.c b/src/core/unit.c
index 02c8b2a45d0d4a9d2821fad311dbbb20c1579d57..dc709d7ca45845ed138fa531e54f4fd167ef6aeb 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -161,6 +161,7 @@ static void unit_init(Unit *u) {
 
                 cc->cpu_accounting = u->manager->default_cpu_accounting;
                 cc->io_accounting = u->manager->default_io_accounting;
+                cc->ip_accounting = u->manager->default_ip_accounting;
                 cc->blockio_accounting = u->manager->default_blockio_accounting;
                 cc->memory_accounting = u->manager->default_memory_accounting;
                 cc->tasks_accounting = u->manager->default_tasks_accounting;