kiwi-build: Drop no-longer-needed SELinux hack
This is not needed since the kiwi executables are correctly labeled. (cherry picked from commit 920caefad7588fbd8897ec5b72e9972e5dd30819)
This commit is contained in:
-14
@@ -68,13 +68,6 @@ if [ "$image_type" = "oci" ]; then
|
||||
kiwi_bundle_format="${kiwi_bundle_format}.%T"
|
||||
fi
|
||||
|
||||
if [ ! ${kiwi_isolated} ] && [ -e "/sys/fs/selinux/enforce" ]; then
|
||||
# Disable SELinux enforcement during the image build if it's enforcing
|
||||
selinux_enforcing="$(cat /sys/fs/selinux/enforce)"
|
||||
if [ "$selinux_enforcing" = "1" ]; then
|
||||
setenforce 0
|
||||
fi
|
||||
fi
|
||||
|
||||
set +e
|
||||
if [ ! ${kiwi_isolated} ]; then
|
||||
@@ -85,13 +78,6 @@ fi
|
||||
kiwi_status=$?
|
||||
set -e
|
||||
|
||||
if [ ! ${kiwi_isolated} ] && [ -e "/sys/fs/selinux/enforce" ]; then
|
||||
# Re-enable SELinux enforcement now that image build is done
|
||||
if [ "$selinux_enforcing" = "1" ]; then
|
||||
setenforce 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${kiwi_status}" = "0" ] && [ -n "$image_release" ]; then
|
||||
kiwi-ng ${debug} result bundle --bundle-format="${kiwi_bundle_format}" --target-dir "${output_dir}-build" --bundle-dir "${output_dir}" --id="${image_release}"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user