nixos/containers: add extraFlags option #35541
Merged
+13
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 tasks
danbst
reviewed
Feb 25, 2018
| @@ -714,7 +724,10 @@ in | |||
| ${optionalString cfg.autoStart '' | |||
| AUTO_START=1 | |||
| ''} | |||
| EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts}" | |||
| EXTRA_NSPAWN_FLAGS="${(mkBindFlags cfg.bindMounts) + | |||
| (if cfg.extraFlags != null && cfg.extraFlags != [] | |||
There was a problem hiding this comment.
cfg.extraFlags can't be null, because it's type doesn't allow it
nix-repl> (lib.evalModules { modules = [
{
options.test = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [];
};
}
{
test = null;
}
]; }).config
{ _module = { ... }; test = «error: The option value `test' in `<unknown-file>' is not of type `list of strings'.»; }
| EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts}" | ||
| EXTRA_NSPAWN_FLAGS="${(mkBindFlags cfg.bindMounts) + | ||
| (if cfg.extraFlags != null && cfg.extraFlags != [] | ||
| then '' ${" " + concatStringsSep " " cfg.extraFlags}'' |
There was a problem hiding this comment.
Also, little nitpicks:
- you can use lib.optionalString instead of if-then-else
- you add one space before antiquotation, and one inside. One of them seems to be redundant
There was a problem hiding this comment.
@danbst thank you for your suggestions to clean up the code
danbst
reviewed
Feb 25, 2018
| else "")}" | ||
| EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts + | ||
| optionalString (cfg.extraFlags != []) | ||
| ''${" " + concatStringsSep " " cfg.extraFlags}''}" |
There was a problem hiding this comment.
Look like ''${...}'' can now be replaced by ( ... ) ;)
|
A bit of topic: User namespaces will not work at the moment |
|
@Mic92 it would be great to have user namespaces fixed so we can start experimenting with them in NixOS. |
to pass extra flags to systemd-nspawn
xeji
force-pushed
the
containers-extraflags
branch
from
9c0adde
to
a82aae3
Compare
|
rebased and squashed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This new option allows the user to pass arbitrary extra flags to systemd-nspawn when starting a container (similar to extraFlags / extraConfig options in many other modules).
My main use cases for this are dropping capabilities and private user namespaces.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)