diff mbox series

[scarthgap,09/29] oeqa/postactions: Do not use -l option with df

Message ID 82a0df6cc2c5b18cb48fd8c3be26a11f4016d98d.1718288230.git.steve@sakoman.com
State RFC
Delegated to: Steve Sakoman
Headers show
Series [scarthgap,01/29] cronie: upgrade 1.7.1 -> 1.7.2 | expand

Commit Message

Steve Sakoman June 13, 2024, 2:20 p.m. UTC 
From: Khem Raj <raj.khem@gmail.com>

-l option is specific to df provided by coreutils, if df
applet from busybox is used then it does not work and fails
like below

Fixes
   df: invalid option -- 'l'
   BusyBox v1.36.1 () multi-call binary.

   Usage: df [-PkmhT] [-t TYPE] [FILESYSTEM]...
   DEBUG: [Command returned '1' after 0.71 seconds]
   DEBUG: Command: df -hl
   Status: 1 Output:  df: invalid option -- 'l'

it seems worth a compromise to show remote mounted filesystems if any
during ptests and it works with both df implementations

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 75cc1ea4348a2294fdc5ab20530fcff27056ff06)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/lib/oeqa/utils/postactions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/lib/oeqa/utils/postactions.py b/meta/lib/oeqa/utils/postactions.py
index 8104400ac2..ecdddd2d40 100644
--- a/meta/lib/oeqa/utils/postactions.py
+++ b/meta/lib/oeqa/utils/postactions.py
@@ -25,7 +25,7 @@  def create_artifacts_directory(d, tc):
 def get_target_disk_usage(d, tc):
     output_file = os.path.join(get_json_result_dir(d), "artifacts", "target_disk_usage.txt")
     try:
-        (status, output) = tc.target.run('df -hl')
+        (status, output) = tc.target.run('df -h')
         with open(output_file, 'w') as f:
             f.write(output)
             f.write("\n")