b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #128126 from wentasah/chrootenv-opt

Browse source
This commit is contained in:
Artturi 2021-11-19 04:40:34 +02:00 committed by GitHub
parent 5e59d5714a b681ad3254
commit d9e8a587e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
View file

@ -156,7 +156,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

2
pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
View file

@ -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);

2
pkgs/build-support/build-fhs-userenv/env.nix
View file

@ -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