commit 2d10e3f54eb215d67cfc9a0ec2bb7e5fb874a2b0
author Elliott Hughes <enh@google.com> Mon Jun 17 23:35:16 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 17 23:35:16 2019 +0000
tree 06d3d49071022cafd82406f63ca1adf6cb2294fb
parent 33ee25466f752420ba42f899457b37f402459005
parent 0e868d039146b0eface6e0c2e7a7197ee61c9a55

Merge "Revert "Revert "Switch to toybox timeout."""

ui/build/paths/config.go

diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index a50a880..c9946e2 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -103,7 +103,6 @@
 	"rsync":    Allowed,
 	"sh":       Allowed,
 	"tar":      Allowed,
-	"timeout":  Allowed,
 	"tr":       Allowed,
 	"unzip":    Allowed,
 	"zip":      Allowed,
@@ -166,6 +165,7 @@
 	"stat":      LinuxOnlyPrebuilt,
 	"tail":      LinuxOnlyPrebuilt,
 	"tee":       LinuxOnlyPrebuilt,
+	"timeout":   LinuxOnlyPrebuilt,
 	"touch":     LinuxOnlyPrebuilt,
 	"true":      LinuxOnlyPrebuilt,
 	"uname":     LinuxOnlyPrebuilt,