github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 17:22:33 +00:00
Code Issues Projects Releases Wiki Activity

image: Use variable for referring to init

Browse Source 
Use a variable rather than hard-coding the expected init daemon path.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2018-05-18 11:04:14 +01:00
parent d25a591def
commit 171eceb426
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
image-builder/image_builder.sh
View File

@ -113,8 +113,9 @@ if [ -n "${USE_DOCKER}" ] ; then
exit $? exit $?
fi fi
# The kata rootfs image expect init and kata-agent to be installed # The kata rootfs image expect init and kata-agent to be installed
init="${ROOTFS}/sbin/init" init_path="/sbin/init"
[ -x "${init}" ] || [ -L ${init} ] || die "/sbin/init is not installed in ${ROOTFS}" init="${ROOTFS}${init_path}"
[ -x "${init}" ] || [ -L ${init} ] || die "${init_path} is not installed in ${ROOTFS}"
OK "init is installed" OK "init is installed"
[ "${AGENT_INIT}" == "yes" ] || [ -x "${ROOTFS}/usr/bin/${AGENT_BIN}" ] || \ [ "${AGENT_INIT}" == "yes" ] || [ -x "${ROOTFS}/usr/bin/${AGENT_BIN}" ] || \
die "/usr/bin/${AGENT_BIN} is not installed in ${ROOTFS} die "/usr/bin/${AGENT_BIN} is not installed in ${ROOTFS}