fhs-userenv-bubblewrap: allow additional arguments to bwrap
This commit is contained in:
parent
2ac78e7a22
commit
29b40b07db
|
@ -8,6 +8,7 @@ args @ {
|
||||||
, extraInstallCommands ? ""
|
, extraInstallCommands ? ""
|
||||||
, meta ? {}
|
, meta ? {}
|
||||||
, passthru ? {}
|
, passthru ? {}
|
||||||
|
, extraBwrapArgs ? []
|
||||||
, unshareUser ? true
|
, unshareUser ? true
|
||||||
, unshareIpc ? true
|
, unshareIpc ? true
|
||||||
, unsharePid ? true
|
, unsharePid ? true
|
||||||
|
@ -23,7 +24,7 @@ let
|
||||||
buildFHSEnv = callPackage ./env.nix { };
|
buildFHSEnv = callPackage ./env.nix { };
|
||||||
|
|
||||||
env = buildFHSEnv (removeAttrs args [
|
env = buildFHSEnv (removeAttrs args [
|
||||||
"runScript" "extraInstallCommands" "meta" "passthru" "dieWithParent"
|
"runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent"
|
||||||
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc"
|
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc"
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
@ -169,6 +170,7 @@ let
|
||||||
"''${ro_mounts[@]}"
|
"''${ro_mounts[@]}"
|
||||||
"''${symlinks[@]}"
|
"''${symlinks[@]}"
|
||||||
"''${auto_mounts[@]}"
|
"''${auto_mounts[@]}"
|
||||||
|
${concatStringsSep "\n " extraBwrapArgs}
|
||||||
${init runScript}/bin/${name}-init ${initArgs}
|
${init runScript}/bin/${name}-init ${initArgs}
|
||||||
)
|
)
|
||||||
exec "''${cmd[@]}"
|
exec "''${cmd[@]}"
|
||||||
|
|
Loading…
Reference in a new issue