From 197dee7a5979ec299c1ffb1df1a9ceb5cfd7f4f2 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 19 Dec 2012 09:13:13 +0100 Subject: timeout: conflict with busybox timeout Signed-off-by: Michael Olbrich --- rules/timeout.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rules/timeout.in b/rules/timeout.in index f8327cd7e..76a5d87a4 100644 --- a/rules/timeout.in +++ b/rules/timeout.in @@ -3,7 +3,11 @@ config TIMEOUT tristate prompt "timeout" + depends on !BUSYBOX_TIMEOUT || ALLYES help timeout executes a command and imposes an elapsed time limit. When the time limit is reached, timeout sends a predefined signal to the target process. + +comment "BusyBox' timeout is selected!" + depends on BUSYBOX_TIMEOUT -- cgit v1.2.3