[PATCH] [autotest-client-tests] UBUNTU: SAUCE: ubuntu_fan_smoke_test: properly generate override.conf

Andrea Righi andrea.righi at canonical.com
Wed Sep 30 14:44:08 UTC 2020


BugLink: https://bugs.launchpad.net/bugs/1896511

To workaround a docker issue the following commit has been applied:

 433215fa "(UBUNTU: SAUCE: ubuntu_fan_smoke_test: workaround docker 'dependency' failure)"

However, with this fix, we are not properly generating override.conf,
that contains an extra "-e" at the beginning of the file, for example:

 ubuntu at moe:~$ cat /etc/systemd/system/containerd.service.d/override.conf
 -e [Service]
 ExecStartPre=

The reason is that the test script is using /bin/sh in the shabang (that
is /bin/dash) and dash'es echo doesn't support "-e".

Prevent this problem (and also other potential dash issues in the
future) by switching to /bin/bash.

Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
---
 ubuntu_fan_smoke_test/ubuntu_fan_smoke_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ubuntu_fan_smoke_test/ubuntu_fan_smoke_test.sh b/ubuntu_fan_smoke_test/ubuntu_fan_smoke_test.sh
index 095a922f..2dce68d7 100755
--- a/ubuntu_fan_smoke_test/ubuntu_fan_smoke_test.sh
+++ b/ubuntu_fan_smoke_test/ubuntu_fan_smoke_test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 #
 # Copyright (C) 2016 Canonical
-- 
2.27.0




More information about the kernel-team mailing list