github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-20 10:20:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #70 from bergwolf/build

Browse Source 
allow to build image and initrd based on existing rootfs
This commit is contained in:
James O. D. Hunt 2018-03-22 16:39:16 +00:00 committed by GitHub
commit d0b3cf6d36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -10,14 +10,19 @@ DISTRO_ROOTFS := "$(PWD)/$(DISTRO)_rootfs"
IMG_SIZE=500 IMG_SIZE=500
AGENT_INIT ?= no AGENT_INIT ?= no
all: rootfs image initrd
rootfs: rootfs:
@echo Creating rootfs based on "$(DISTRO)" @echo Creating rootfs based on "$(DISTRO)"
"$(MK_DIR)/rootfs-builder/rootfs.sh" -r "$(DISTRO_ROOTFS)" "$(DISTRO)" "$(MK_DIR)/rootfs-builder/rootfs.sh" -r "$(DISTRO_ROOTFS)" "$(DISTRO)"
image: rootfs image: rootfs image-only
image-only:
@echo Creating image based on "$(DISTRO_ROOTFS)" @echo Creating image based on "$(DISTRO_ROOTFS)"
"$(MK_DIR)/image-builder/image_builder.sh" -s "$(IMG_SIZE)" "$(DISTRO_ROOTFS)" "$(MK_DIR)/image-builder/image_builder.sh" -s "$(IMG_SIZE)" "$(DISTRO_ROOTFS)"
initrd: rootfs initrd: rootfs initrd-only
initrd-only:
@echo Creating initrd image based on "$(DISTRO_ROOTFS)" @echo Creating initrd image based on "$(DISTRO_ROOTFS)"
"$(MK_DIR)/initrd-builder/initrd_builder.sh" "$(DISTRO_ROOTFS)" "$(MK_DIR)/initrd-builder/initrd_builder.sh" "$(DISTRO_ROOTFS)"

2
initrd-builder/initrd_builder.sh
View File

@ -85,7 +85,7 @@ IMAGE_NAME=$(basename ${INITRD_IMAGE})
# The kata rootfs image expects init to be installed # The kata rootfs image expects init to be installed
init="${ROOTFS}/sbin/init" init="${ROOTFS}/sbin/init"
[ -x "${init}" ] || [ -L ${init} ] || die "/sbin/init is not installed in ${ROOTFS_DIR}" [ -x "${init}" ] || [ -L ${init} ] || die "/sbin/init 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}