From 21a17b33f49f3f016e35e535af0b81fdb53f0846 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sat, 21 Sep 2019 15:15:14 +0100
Subject: fix(build): Ensure launch script compatibility with other runtimes

Fixes two launch script compatibility issues with other container
runtimes (such as gvisor):

* don't fail if /tmp already exists
* don't fail if the environment becomes unset
---
 tools/nixery/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix
index dd07d34936e4..66155eefa060 100644
--- a/tools/nixery/default.nix
+++ b/tools/nixery/default.nix
@@ -59,8 +59,9 @@ rec {
     # issues in containers.
     nixery-launch-script = writeShellScriptBin "nixery" ''
       set -e
+      export PATH=${coreutils}/bin:$PATH
       export NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
-      mkdir /tmp
+      mkdir -p /tmp
 
       # Create the build user/group required by Nix
       echo 'nixbld:x:30000:nixbld' >> /etc/group
-- 
cgit 1.4.1