浏览代码

hack/make: ignore failure to stop apparmor

```
 ---> Making bundle: .integration-daemon-stop (in bundles/test-integration)
 ++++ cat bundles/test-integration/docker.pid
 +++ kill 13137
 +++ /etc/init.d/apparmor stop
 Leaving: AppArmorNo profiles have been unloaded.

 Unloading profiles will leave already running processes permanently
 unconfined, which can lead to unexpected situations.

 To set a process to complain mode, use the command line tool
 'aa-complain'. To really tear down all profiles, run 'aa-teardown'."

script returned exit code 255
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5dbfae694919b1aff76f360061b4065349bf1900)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 5 年之前
父节点
当前提交
a070874828
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      hack/make/.integration-daemon-stop

+ 1 - 1
hack/make/.integration-daemon-stop

@@ -19,7 +19,7 @@ if [ ! "$(go env GOOS)" = 'windows' ]; then
 		if [ -e "/sys/module/apparmor/parameters/enabled" ] && [ "$(cat /sys/module/apparmor/parameters/enabled)" == "Y" ]; then
 		if [ -e "/sys/module/apparmor/parameters/enabled" ] && [ "$(cat /sys/module/apparmor/parameters/enabled)" == "Y" ]; then
 			(
 			(
 				[ -n "$TESTDEBUG" ] && set -x
 				[ -n "$TESTDEBUG" ] && set -x
-				/etc/init.d/apparmor stop
+				/etc/init.d/apparmor stop || true
 			)
 			)
 		fi
 		fi
 	fi
 	fi