summaryrefslogtreecommitdiff
diff options
authorPMR <pmr@pmr-lander>2017-08-22 20:36:25 +0000
committerPMR <pmr@pmr-lander>2017-08-22 20:36:25 +0000
commitd2299fcc5b983d947a93dd7f14fcc9c5ebdb7388 (patch)
treef1cd0615615b1529227f8f30d9e3e540a0c914e3
parentdb7f8360884254cf62cfc2c54c102038850dae0d (diff)
parent25bc9f49d75cb70e3b2d88c4ebb3fbb4c63ce409 (diff)
Merge #329336 from ~bladernr/plainbox-provider-checkbox:1712103-fix-dmesg-attachment
-rw-r--r--jobs/info.txt.in12
1 files changed, 9 insertions, 3 deletions
diff --git a/jobs/info.txt.in b/jobs/info.txt.in
index 0b270d8..900d4c7 100644
--- a/jobs/info.txt.in
+++ b/jobs/info.txt.in
@@ -31,10 +31,16 @@ _summary: Attach a copy of /proc/cpuinfo
id: dmesg_attachment
plugin: attachment
category_id: com.canonical.plainbox::info
-command: cat /var/log/dmesg | ansi_parser
+user: root
+command:
+ if [ -e /var/log/dmesg ]; then
+ cat /var/log/dmesg | ansi_parser
+ else
+ dmesg | ansi_parser
+ fi
estimated_duration: 0.640
-_description: Attaches a copy of /var/log/dmesg to the test results
-_summary: Attach a copy of /var/log/dmesg
+_description: Attaches a copy of /var/log/dmesg or the current dmesg buffer to the test results
+_summary: Attach a copy of dmesg
id: dmi_attachment
plugin: attachment