From dd2bcea76ddf85f50938de1d20ee95c072ec6b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Can=20B=C3=B6l=C3=BCk?= <can1357@users.noreply.github.com>
Date: Fri, 3 Apr 2026 11:06:43 +0200
Subject: [PATCH] timeout: return timed-out status after kill grace period
 (#11392)

Co-authored-by: Sylvestre Ledru <sylvestre@debian.org>
---
 src/uu/timeout/src/timeout.rs | 2 +-
 tests/by-util/test_timeout.rs | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs
index cb483db8f..5d5511cf1 100644
--- a/src/uu/timeout/src/timeout.rs
+++ b/src/uu/timeout/src/timeout.rs
@@ -296,7 +296,7 @@ fn wait_or_kill_process(
                 });
                 Ok(exit_code)
             } else {
-                Ok(ExitStatus::TimeoutFailed.into())
+                Ok(ExitStatus::CommandTimedOut.into())
             }
         }
         Ok(None) => {
diff --git a/tests/by-util/test_timeout.rs b/tests/by-util/test_timeout.rs
index bb2ea78b8..d6b0afb11 100644
--- a/tests/by-util/test_timeout.rs
+++ b/tests/by-util/test_timeout.rs
@@ -104,6 +104,13 @@ fn test_preserve_status() {
     }
 }
 
+#[test]
+fn test_kill_after_preserves_timeout_exit_without_preserve_status() {
+    new_ucmd!()
+        .args(&["-k", "1", "1", "sleep", "10"])
+        .fails_with_code(124)
+        .no_output();
+}
 #[test]
 fn test_preserve_status_even_when_send_signal() {
     // When sending CONT signal, process doesn't get killed or stopped.