JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firejail: local profile handling fixed

Browse Source 
The sed expression wasn't really catching anything (as local profiles are
included in the provided set of profiles by `include aaa.local` and not by
`include xx/firejail/aaa.local` as the sed expression used to expect).
As a result, it was not possible to create local profiles in any
accessible location. This fix makes it possible to create them in
`/etc/firejail/` which seems pretty standard.
This commit is contained in:
snicket2100 2020-01-11 20:49:48 +01:00
parent 3d67d0284d
commit 0778f0aee6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/firejail/default.nix
View File

@ -36,10 +36,10 @@ stdenv.mkDerivation {
sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile 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 # /etc/firejail so we can actually override them
postInstall = '' 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: # At high parallelism, the build sometimes fails with: