summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2019-06-17 23:35:16 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-06-17 23:35:16 +0000
commit2d10e3f54eb215d67cfc9a0ec2bb7e5fb874a2b0 (patch)
tree06d3d49071022cafd82406f63ca1adf6cb2294fb
parent33ee25466f752420ba42f899457b37f402459005 (diff)
parent0e868d039146b0eface6e0c2e7a7197ee61c9a55 (diff)
Merge "Revert "Revert "Switch to toybox timeout."""
-rw-r--r--ui/build/paths/config.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index a50a880a3..c9946e297 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -103,7 +103,6 @@ var Configuration = map[string]PathConfig{
"rsync": Allowed,
"sh": Allowed,
"tar": Allowed,
- "timeout": Allowed,
"tr": Allowed,
"unzip": Allowed,
"zip": Allowed,
@@ -166,6 +165,7 @@ var Configuration = map[string]PathConfig{
"stat": LinuxOnlyPrebuilt,
"tail": LinuxOnlyPrebuilt,
"tee": LinuxOnlyPrebuilt,
+ "timeout": LinuxOnlyPrebuilt,
"touch": LinuxOnlyPrebuilt,
"true": LinuxOnlyPrebuilt,
"uname": LinuxOnlyPrebuilt,