1
0
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00

Fix building the iso

This commit is contained in:
Ivan Mikushin
2016-06-13 14:30:21 -07:00
parent 42ef7c062a
commit 9afb667cf4
3 changed files with 7 additions and 5 deletions

View File

@@ -7,8 +7,9 @@ source ./scripts/version
DOCKERFILE=./scripts/installer/Dockerfile.${ARCH}
if [ ! -e $DOCKERFILE ] || [ ! -e dist/artifacts/vmlinuz ]; then
exit 0
if [ ! -f $DOCKERFILE ] || [ ! -f dist/artifacts/vmlinuz ] || [ ! -f dist/artifacts/initrd ]; then
echo "Error: ${DOCKERFILE}, dist/artifacts/vmlinuz or dist/artifacts/initrd is missing"
exit 1
fi
mkdir -p ./scripts/installer/build

View File

@@ -10,8 +10,9 @@ CD=${BUILD}/cd
mkdir -p ${CD}/boot/isolinux
mkdir -p ${CD}/boot/isolinux
if [ ! -x ${ARTIFACTS}/vmlinuz ]; then
exit 0
if [ ! -f ${ARTIFACTS}/vmlinuz ] || [ ! -f ${ARTIFACTS}/initrd ]; then
echo "Error: vmlinuz or initrd is missing in ${ARTIFACTS}/"
exit 1
fi
cp ${ARTIFACTS}/initrd ${CD}/boot

View File

@@ -17,7 +17,7 @@ mkdir -p ${ARTIFACTS} ${PREPOP_DIR}
if [ "$(docker info | grep 'Storage Driver: ' | sed 's/Storage Driver: //')" != "overlay" ]; then
echo Overlay storage driver is require do create rootfs.tar 1>&2
exit 0
exit 1
fi
DFS=$(docker run -d --privileged -v /lib/modules/$(uname -r):/lib/modules/$(uname -r) ${DFS_IMAGE}${SUFFIX} ${DFS_ARGS})