diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-08-24 01:59:20 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-08-24 02:01:00 +0300 |
| commit | f1187c5b14c86fa05b4de990a1167be02ca4615f (patch) | |
| tree | 9cf55e4f1a69e4a47b822d241d4bdbd11919ac76 /pkgs/build-support | |
| parent | ec27ba44d0a39a25ada21e0eb6d480213823d6ff (diff) | |
| download | nixpkgs-f1187c5b14c86fa05b4de990a1167be02ca4615f.tar nixpkgs-f1187c5b14c86fa05b4de990a1167be02ca4615f.tar.gz nixpkgs-f1187c5b14c86fa05b4de990a1167be02ca4615f.tar.bz2 nixpkgs-f1187c5b14c86fa05b4de990a1167be02ca4615f.tar.lz nixpkgs-f1187c5b14c86fa05b4de990a1167be02ca4615f.tar.xz nixpkgs-f1187c5b14c86fa05b4de990a1167be02ca4615f.tar.zst nixpkgs-f1187c5b14c86fa05b4de990a1167be02ca4615f.zip | |
build-fhs-userenv: move /tmp handling to bash part
Diffstat (limited to 'pkgs/build-support')
| -rwxr-xr-x | pkgs/build-support/build-fhs-userenv/chroot-user.rb | 7 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/default.nix | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index c31d0f7a258..b7d6276ceab 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -14,10 +14,6 @@ mounts = [ ['/nix/store', nil], ['/root', nil], ] -# Create directories -mkdirs = ['tmp', - ] - # Propagate environment variables envvars = [ 'TERM', 'DISPLAY', @@ -100,9 +96,6 @@ if $cpid == 0 write_file '/proc/self/uid_map', "#{uid} #{uid} 1" write_file '/proc/self/gid_map', "#{gid} #{gid} 1" - # Do mkdirs - mkdirs.each { |x| FileUtils.mkdir_p "#{root}/#{x}" } - # Do rbind mounts. mounts.each do |x| to = "#{root}/#{x[1]}" diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index b5b77f9984a..b57b687e20f 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -10,6 +10,9 @@ let ''; init = writeText "init" '' + # Make /tmp directory + mkdir -m 1777 /tmp + # Expose sockets in /tmp for i in /host-tmp/.*-unix; do ln -s "$i" "/tmp/$(basename "$i")" |