rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 14:23:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #998 from imikushin/fix-iso-build

Browse Source 
Fix building the iso
This commit is contained in:
Darren Shepherd
2016-06-13 17:12:57 -07:00
committed by GitHub
parent 10a179cbbd 9afb667cf4
commit 025e555fde
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/package-installer
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

5
scripts/package-iso
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

2
scripts/package-rootfs
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})