浏览代码

Merge pull request #13830 from clnperez/check-apparmor-file-first

Check for apparmor file before reading it
Tibor Vass 10 年之前
父节点
当前提交
fc793bf1a3
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      hack/make/.integration-daemon-start
  2. 1 1
      hack/make/.integration-daemon-stop

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

@@ -28,7 +28,7 @@ fi
 
 if [ -z "$DOCKER_TEST_HOST" ]; then
 	# Start apparmor if it is enabled
-	if [ "$(cat /sys/module/apparmor/parameters/enabled)" == "Y" ]; then
+	if [ -e "/sys/module/apparmor/parameters/enabled" ] && [ "$(cat /sys/module/apparmor/parameters/enabled)" == "Y" ]; then
 		# reset container variable so apparmor profile is applied to process
 		# see https://github.com/docker/libcontainer/blob/master/apparmor/apparmor.go#L16
 		export container=""

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

@@ -12,7 +12,7 @@ done
 
 if [ -z "$DOCKER_TEST_HOST" ]; then
 	# Stop apparmor if it is enabled
-	if [ "$(cat /sys/module/apparmor/parameters/enabled)" == "Y" ]; then
+	if [ -e "/sys/module/apparmor/parameters/enabled" ] && [ "$(cat /sys/module/apparmor/parameters/enabled)" == "Y" ]; then
 		(
 			set -x
 			/etc/init.d/apparmor stop