Merge branch 'master' into systemd-219

Conflicts:
	nixos/modules/system/boot/systemd.nix
	pkgs/applications/networking/p2p/transmission/default.nix
	pkgs/development/libraries/libseccomp/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/top-level/all-packages.nix

1 files changed, 1 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 c555f053875a..b7d6276ceab0 100755
--- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb
+++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
@@ -7,16 +7,13 @@ mounts = [ ['/nix/store', nil],
            ['/proc', nil],
            ['/sys', nil],
            ['/etc', 'host-etc'],
+           ['/tmp', 'host-tmp'],
            ['/home', nil],
            ['/var', nil],
            ['/run', nil],
            ['/root', nil],
          ]
 
-# Create directories
-mkdirs = ['tmp',
-         ]
-
 # Propagate environment variables
 envvars = [ 'TERM',
             'DISPLAY',
@@ -99,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]}"