From 691ed6ef995b8ee7cf9bdcea29ccf4b58a244234 Mon Sep 17 00:00:00 2001 From: Christy Perez Date: Tue, 9 Jun 2015 14:01:58 -0500 Subject: [PATCH] Check for apparmor file before reading it I ran a single integration test and got an error that the file /sys/module/apparmor/parameters/enabled doesn't exist. I don't have apparmor installed. So, just check the file first to avoid a confusing error. Signed-off-by: Christy Perez --- hack/make/.integration-daemon-start | 2 +- hack/make/.integration-daemon-stop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/make/.integration-daemon-start b/hack/make/.integration-daemon-start index 9655f58335..dcc09fa920 100644 --- a/hack/make/.integration-daemon-start +++ b/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="" diff --git a/hack/make/.integration-daemon-stop b/hack/make/.integration-daemon-stop index 364490bdef..a72f1810bc 100644 --- a/hack/make/.integration-daemon-stop +++ b/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