Merge pull request #77524 from snicket2100/firejail-local-profiles-fixed

firejail: local profile handling fixed
This commit is contained in:
Michael Raskin 2020-01-12 13:09:18 +00:00 committed by GitHub
commit 20e74c9868
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -36,10 +36,10 @@ stdenv.mkDerivation {
sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile
'';
# We need to set the directory for the .local override files back to
# We need to set the directory for the .local override files to
# /etc/firejail so we can actually override them
postInstall = ''
sed -E -e 's@^include (.*)(/firejail/.*.local)$@include /etc\2@g' -i $out/etc/firejail/*.profile
sed -E -e 's@^include (.*.local)$@include /etc/firejail/\1@g' -i $out/etc/firejail/*.profile
'';
# At high parallelism, the build sometimes fails with: