Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 74107a7867aa0c55c9d823726f80f9fb6cf3251c
https://github.com/NixOS/nixpkgs/commit/74107a7867aa0c55c9d823726f80f9fb6cf3251c
Author: Nikolay Amiantov <[email protected]>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
R pkgs/build-support/build-fhs-chrootenv/default.nix
R pkgs/build-support/build-fhs-chrootenv/destroy.sh.in
R pkgs/build-support/build-fhs-chrootenv/env.nix
R pkgs/build-support/build-fhs-chrootenv/init.sh.in
R pkgs/build-support/build-fhs-chrootenv/load.sh.in
R pkgs/build-support/build-fhs-chrootenv/mount.sh.in
R pkgs/build-support/build-fhs-chrootenv/umount.sh.in
M pkgs/build-support/build-fhs-userenv/chroot-user.rb
M pkgs/build-support/build-fhs-userenv/default.nix
A pkgs/build-support/build-fhs-userenv/env.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
buildFHSEnv: refactor and simplify, drop buildFHSChrootEnv
This takes another approach at binding FHS directory structure. We
now bind-mount all the root filesystem to directory "/host" in the target tree.
>From that we symlink all the directories into the tree if they do not already
exist in FHS structure.
This probably makes `CHROOTENV_EXTRA_BINDS` unnecessary -- its main usecase was
to add bound directories from the host to the sandbox, and we not just symlink
all of them. I plan to get some feedback on its usage and maybe deprecate it.
This also drops old `buildFHSChrootEnv` infrastructure. The main problem with it
is it's very difficult to unmount a recursive-bound directory when mount is not
sandboxed. This problem is a bug even without these changes -- if
you have for example `/home/alice` mounted to somewhere, you wouldn't see
it in `buildFHSChrootEnv` now. With the new directory structure, it's
impossible to use regular bind at all. After some tackling with this I realized
that the fix would be brittle and dangerous (if you don't unmount everything
clearly and proceed to removing the temporary directory, bye-bye fs!). It also
probably doesn't worth it because I haven't heard that someone actually uses it
for a long time, and `buildFHSUserEnv` should cover most cases while being much
more maintainable and safe for the end-user.
Commit: 8d9e5d297d8c7aa6c1aa77bf3d4b9dd3fba7c9ec
https://github.com/NixOS/nixpkgs/commit/8d9e5d297d8c7aa6c1aa77bf3d4b9dd3fba7c9ec
Author: Nikolay Amiantov <[email protected]>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
M pkgs/build-support/build-fhs-userenv/env.nix
Log Message:
-----------
buildFHSEnv: don't link GCC compiler part
Commit: 3e90b00c1081dc878a2b9ab195c9bb136104f3cd
https://github.com/NixOS/nixpkgs/commit/3e90b00c1081dc878a2b9ab195c9bb136104f3cd
Author: Nikolay Amiantov <[email protected]>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
M pkgs/build-support/build-fhs-userenv/env.nix
Log Message:
-----------
buildFHSEnv: link 'bin' output
Commit: 3d8664ee42d43218bdec1cc9b1075998ad66082f
https://github.com/NixOS/nixpkgs/commit/3d8664ee42d43218bdec1cc9b1075998ad66082f
Author: Nikolay Amiantov <[email protected]>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
M pkgs/build-support/build-fhs-userenv/chroot-user.rb
Log Message:
-----------
buildFHSUserEnv: mark CHROOTENV_EXTRA_BINDS as discussed for deprecation
Commit: 75ea0523c41372cea4450f748c5ef59b0d01702e
https://github.com/NixOS/nixpkgs/commit/75ea0523c41372cea4450f748c5ef59b0d01702e
Author: Nikolay Amiantov <[email protected]>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M doc/functions.xml
Log Message:
-----------
doc: update buildFHSUserEnv documentation
Commit: b341de88e9c139d549261411b624c41a96228f6b
https://github.com/NixOS/nixpkgs/commit/b341de88e9c139d549261411b624c41a96228f6b
Author: Nikolay Amiantov <[email protected]>
Date: 2016-06-11 (Sat, 11 Jun 2016)
Changed paths:
M doc/functions.xml
R pkgs/build-support/build-fhs-chrootenv/default.nix
R pkgs/build-support/build-fhs-chrootenv/destroy.sh.in
R pkgs/build-support/build-fhs-chrootenv/env.nix
R pkgs/build-support/build-fhs-chrootenv/init.sh.in
R pkgs/build-support/build-fhs-chrootenv/load.sh.in
R pkgs/build-support/build-fhs-chrootenv/mount.sh.in
R pkgs/build-support/build-fhs-chrootenv/umount.sh.in
M pkgs/build-support/build-fhs-userenv/chroot-user.rb
M pkgs/build-support/build-fhs-userenv/default.nix
A pkgs/build-support/build-fhs-userenv/env.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge pull request #16030 from abbradar/fhs-refactor
Improvements for FHS user chrootenv
Compare: https://github.com/NixOS/nixpkgs/compare/9fbd5cf1bd76...b341de88e9c1_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits