mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-24 07:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1721 from vcaputo/prevent-disabling-selinux

Browse Source 
app-emulation/docker: don't clobber --selinux-enabled
This commit is contained in:
Vito Caputo 2016-01-13 13:56:36 -08:00
commit aac6a89952
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.9.1-r2.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.9.1-r3.ebuild vendored
View File

18
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd vendored
View File

@ -24,6 +24,10 @@ parse_docker_args() {
ARG_DRIVER="$1"
shift
;;
--selinux-enabled)
ARG_SELINUX="$1"
shift
;;
*)
# ignore everything else
;;
@ -55,13 +59,15 @@ select_docker_driver() {
esac
}
maybe_disable_selinux() {
# Enable selinux except when known to be unsupported (btrfs).
maybe_enable_selinux() {
case "${DOCKER_DRIVER}" in
btrfs)
USE_SELINUX=""
;;
*)
# Leave enabled for everything else.
# Enable for everything else.
USE_SELINUX="--selinux-enabled"
;;
esac
}
@ -75,8 +81,10 @@ if [[ -z "${ARG_DRIVER}" && -z "${DOCKER_DRIVER}" ]]; then
select_docker_driver
fi
# Enable selinux except when known to be unsupported (btrfs).
USE_SELINUX="--selinux-enabled"
maybe_disable_selinux
USE_SELINUX=""
# Do not override selinux if it is already explicitly configured.
if [[ -z "${ARG_SELINUX}" ]]; then
maybe_enable_selinux
fi
exec docker "$@" ${USE_SELINUX}