diff options
| author | Artturi <Artturin@artturin.com> | 2021-11-19 04:40:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-19 04:40:34 +0200 |
| commit | d9e8a587e143aa8d3f1594004d63b5c785b416fb (patch) | |
| tree | 78ab70c85e91b2c0fc13eab6b25a60df24363734 /pkgs/build-support/build-fhs-userenv | |
| parent | 5e59d5714a57f253ada26c4ba49f8ecb74a90e21 (diff) | |
| parent | b681ad32540c5bcb93d3cb98dfd25f22f2eb5503 (diff) | |
| download | nixpkgs-d9e8a587e143aa8d3f1594004d63b5c785b416fb.tar nixpkgs-d9e8a587e143aa8d3f1594004d63b5c785b416fb.tar.gz nixpkgs-d9e8a587e143aa8d3f1594004d63b5c785b416fb.tar.bz2 nixpkgs-d9e8a587e143aa8d3f1594004d63b5c785b416fb.tar.lz nixpkgs-d9e8a587e143aa8d3f1594004d63b5c785b416fb.tar.xz nixpkgs-d9e8a587e143aa8d3f1594004d63b5c785b416fb.tar.zst nixpkgs-d9e8a587e143aa8d3f1594004d63b5c785b416fb.zip | |
Merge pull request #128126 from wentasah/chrootenv-opt
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c | 2 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/env.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c index 324c9d24ba0..c109d7297e1 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c @@ -18,7 +18,7 @@ if (expr) \ fail(#expr, errno); -const gchar *bind_blacklist[] = {"bin", "etc", "host", "real-host", "usr", "lib", "lib64", "lib32", "sbin", NULL}; +const gchar *bind_blacklist[] = {"bin", "etc", "host", "real-host", "usr", "lib", "lib64", "lib32", "sbin", "opt", NULL}; int pivot_root(const char *new_root, const char *put_old) { return syscall(SYS_pivot_root, new_root, put_old); diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index da4521b4de3..44c8adb06e1 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -184,7 +184,7 @@ let done cd .. - for i in var etc; do + for i in var etc opt; do if [ -d "${staticUsrProfileTarget}/$i" ]; then cp -rsHf "${staticUsrProfileTarget}/$i" "$i" fi |