github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-17 23:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #287 from marcov/no-create-1

Browse Source 
rootfs: use command vs which, avoid "1" file creation
This commit is contained in:
James O. D. Hunt 2019-05-10 16:18:50 +01:00 committed by GitHub
commit 4a2fa6875d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rootfs-builder/rootfs.sh
View File

@ -337,7 +337,7 @@ if [ -n "${USE_DOCKER}" ] ; then
docker_run_args+=" $(docker_extra_args $distro)" docker_run_args+=" $(docker_extra_args $distro)"
# Relabel volumes so SELinux allows access (see docker-run(1)) # Relabel volumes so SELinux allows access (see docker-run(1))
if which selinuxenabled 2&>1 >/dev/null && selinuxenabled ; then if command -v selinuxenabled > /dev/null && selinuxenabled ; then
for volume_dir in "${script_dir}" \ for volume_dir in "${script_dir}" \
"${ROOTFS_DIR}" \ "${ROOTFS_DIR}" \
"${script_dir}/../scripts" \ "${script_dir}/../scripts" \