瀏覽代碼

Merge pull request #15277 from calavera/check_apparmor_docker_contrib

Include apparmor/docker only when it exists.
Jessie Frazelle 10 年之前
父節點
當前提交
dff25c9e46
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      hack/make/ubuntu

+ 4 - 2
hack/make/ubuntu

@@ -73,8 +73,10 @@ bundle_ubuntu() {
 	done
 	done
 
 
 	# Include contributed apparmor policy
 	# Include contributed apparmor policy
-	mkdir -p "$DIR/etc/apparmor.d/"
-	cp contrib/apparmor/* "$DIR/etc/apparmor.d/"
+	if [ -d contrib/apparmor ]; then
+		mkdir -p "$DIR/etc/apparmor.d/"
+		cp contrib/apparmor/* "$DIR/etc/apparmor.d/"
+	fi
 
 
 	# Copy the binary
 	# Copy the binary
 	# This will fail if the binary bundle hasn't been built
 	# This will fail if the binary bundle hasn't been built