rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-05 16:54:21 +00:00
Code Issues Releases Wiki Activity

Build script updates

Browse Source
This commit is contained in:
Darren Shepherd 2016-06-06 16:06:10 -07:00
parent 29c6aac571
commit ac0f317bf8
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/package-iso
View File

@ -10,6 +10,10 @@ CD=${BUILD}/cd
mkdir -p ${CD}/boot/isolinux mkdir -p ${CD}/boot/isolinux
mkdir -p ${CD}/boot/isolinux mkdir -p ${CD}/boot/isolinux
if [ ! -x ${ARTIFACTS}/vmlinuz ]; then
exit 0
fi
cp ${ARTIFACTS}/initrd ${CD}/boot cp ${ARTIFACTS}/initrd ${CD}/boot
cp ${ARTIFACTS}/vmlinuz ${CD}/boot cp ${ARTIFACTS}/vmlinuz ${CD}/boot
cp scripts/isolinux.cfg ${CD}/boot/isolinux cp scripts/isolinux.cfg ${CD}/boot/isolinux

10
scripts/package-rootfs
View File

@ -1,8 +1,11 @@
#!/bin/bash #!/bin/bash
set -e set -e
set -o pipefail
cd $(dirname $0)/.. cd $(dirname $0)/..
source scripts/version
BUILD=$(pwd)/build BUILD=$(pwd)/build
IMAGE_CACHE=${BUILD}/image-cache IMAGE_CACHE=${BUILD}/image-cache
PREPOP_DIR=${IMAGE_CACHE}/var/lib/system-docker PREPOP_DIR=${IMAGE_CACHE}/var/lib/system-docker
@ -12,7 +15,12 @@ INITRD=${ARTIFACTS}/initrd
mkdir -p ${ARTIFACTS} ${PREPOP_DIR} mkdir -p ${ARTIFACTS} ${PREPOP_DIR}
DFS=$(docker run -d --privileged -v /lib/modules/$(uname -r):/lib/modules/$(uname -r) ${DFS_IMAGE}${SUFFIX}) 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
fi
DFS=$(docker run -d --privileged -v /lib/modules/$(uname -r):/lib/modules/$(uname -r) ${DFS_IMAGE}${SUFFIX} ${DFS_ARGS})
trap "docker rm -fv ${DFS_ARCH} ${DFS}" EXIT trap "docker rm -fv ${DFS_ARCH} ${DFS}" EXIT
docker exec -i ${DFS} docker load < ${INITRD_DIR}/usr/share/ros/images.tar docker exec -i ${DFS} docker load < ${INITRD_DIR}/usr/share/ros/images.tar
docker stop ${DFS} docker stop ${DFS}