These two commits allow nspawn to play nicely with a cgroup hierarchy manually
set beforehand.
Iago López Galeiras (2):
nspawn: only mount the cgroup root if it's not already mounted
nspawn: skip symlink to a combined cgroup hierarchy if it already
exists
src/nspawn/nspawn.c | 34
This allows the user to set the cgroups manually before calling nspawn.
---
src/nspawn/nspawn.c | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 2f7dd53..c67cab2 100644
--- a/src/nspawn/nspawn.c
+++
If a symlink to a combined cgroup hierarchy already exists and points to
the right path, skip it. This avoids an error when the cgroups are set
manually before calling nspawn.
---
src/nspawn/nspawn.c | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git
If a symlink to a combined cgroup hierarchy already exists and points to
the right path, skip it. This avoids an error when the cgroups are set
manually before calling nspawn.
---
src/nspawn/nspawn.c | 10 --
src/shared/util.c | 23 +++
src/shared/util.h | 1 +
3
This allows the user to set the cgroups manually before calling nspawn.
---
src/nspawn/nspawn.c | 23 +++
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 8c91726..f292c63 100644
--- a/src/nspawn/nspawn.c
+++
These two commits allow nspawn to play nicely with a cgroup hierarchy manually
set beforehand.
Iago López Galeiras (2):
nspawn: only mount the cgroup root if it's not already mounted
nspawn: skip symlink to a combined cgroup hierarchy if it already
exists
src/nspawn/nspawn.c | 33
Try to keep syscalls as minimal as possible.
---
src/core/namespace.c | 2 +-
src/nspawn/nspawn.c | 16
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/core/namespace.c b/src/core/namespace.c
index f8a2bbc..718da23 100644
--- a/src/core/namespace.c
+++
is an ACI and set
/var/lib/machines/appc-image.aci/rootfs as the container's root. The benefit of
keeping the manifest would be knowing which binary to start. Is that acceptable?
[1]: https://github.com/appc/spec/blob/master/SPEC.md
Cheers,
Iago
--
Iago López Galeiras, Endocode AG
Empty environment variables in Environment= and EnvironmentFile= options
work.
---
TODO | 2 --
1 file changed, 2 deletions(-)
diff --git a/TODO b/TODO
index d4138fe..3e8d04c 100644
--- a/TODO
+++ b/TODO
@@ -191,8 +191,6 @@ Features:
* generator that automatically discovers btrfs subvolumes,
Clarified commit message (thanks Koen Kooi)
Iago López Galeiras (2):
test: support empty environment variables in unit files
update TODO
TODO | 2 --
src/test/test-unit-file.c | 22 ++
2 files changed, 22 insertions(+), 2 deletions(-)
--
2.1.3
---
src/test/test-unit-file.c | 22 ++
1 file changed, 22 insertions(+)
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 03b3e25..f31a1bb 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -222,6 +222,9 @@ static void
arch-tree bash[131]: _=/usr/sbin/env
Iago López Galeiras (2):
test: empty environment variables in unit files
update TODO
TODO | 2 --
src/test/test-unit-file.c | 22 ++
2 files changed, 22 insertions(+), 2 deletions(-)
--
2.1.3
Empty environment variables in Environment= and EnvironmentFile= options
work.
---
TODO | 2 --
1 file changed, 2 deletions(-)
diff --git a/TODO b/TODO
index d4138fe..3e8d04c 100644
--- a/TODO
+++ b/TODO
@@ -191,8 +191,6 @@ Features:
* generator that automatically discovers btrfs subvolumes,
---
src/test/test-unit-file.c | 22 ++
1 file changed, 22 insertions(+)
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 03b3e25..f31a1bb 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -222,6 +222,9 @@ static void
14 matches
Mail list logo