From 3f078a99171d32ad575cca63a08ef3fdf2d3c183 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Sat, 14 Mar 2015 18:23:31 -0700
Subject: [PATCH] Build script updates for os-base 0.1.0

---
 build.sh                     |  2 ++
 scripts/build-images         |  4 +++-
 scripts/ci                   |  2 +-
 scripts/dockerimages/00-base |  2 +-
 scripts/download             |  2 +-
 scripts/run                  | 19 ++++++++++++++++---
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index 181a555d..a55e8434 100755
--- a/build.sh
+++ b/build.sh
@@ -19,3 +19,5 @@ fi
 if echo "$@" | grep -q -- '--push'; then
     docker push rancher/ubuntuconsole
 fi
+
+ls -l dist/artifacts
diff --git a/scripts/build-images b/scripts/build-images
index 3f3dad78..3b143679 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -12,6 +12,8 @@ mkdir -p ${BUILD}/initrd ${DIST}/artifacts
 echo Extracting ${ARTIFACTS}/os-base.tar.xz
 tar xJf ${ARTIFACTS}/os-base.tar.xz -C ${BUILD}
 
+tar xvf ${BUILD}/dist/kernel/*.tar -C ${BUILD}/dist/kernel
+
 cp /etc/ssl/certs/ca-certificates.crt ${ARTIFACTS}/ca.crt
 cp /etc/ssl/certs/ca-certificates.crt ${BUILD}/initrd/ca.crt
 cp ${BUILD}/dist/rootfs.tar ${ARTIFACTS}
@@ -37,7 +39,7 @@ cp -rf ${BUILD}/dist/kernel/lib ${BUILD}/initrd
 cp -f ${ARTIFACTS}/docker* ${BUILD}/initrd/docker
 chmod +x ${BUILD}/initrd/docker
 
-cp ${BUILD}/dist/kernel/bzImage ${DIST}/artifacts/vmlinuz
+cp ${BUILD}/dist/kernel/boot/vmlinuz* ${DIST}/artifacts/vmlinuz
 
 tar xf ${BUILD}/dist/rootfs-static.tar -C ${BUILD}/initrd --strip-components=2 ./bin/busybox
 
diff --git a/scripts/ci b/scripts/ci
index 967dd4af..b2f496fc 100755
--- a/scripts/ci
+++ b/scripts/ci
@@ -47,7 +47,7 @@ generate_images
 
 reset_docker_build
 ARGS=
-for i in $(ls -d * .* | sort -u | grep -Ev '(\.|\.\.|\.dockerfile|build|dist|.git|scripts|bin)$'); do
+for i in $(ls -d * .* | sort -u | grep -Ev '(\.|\.\.|\.dockerfile|build|dist|.git|scripts|bin|state)$'); do
     if [ -d $i ]; then
         run --assets $i
     else
diff --git a/scripts/dockerimages/00-base b/scripts/dockerimages/00-base
index 273cfa91..658b30cb 100644
--- a/scripts/dockerimages/00-base
+++ b/scripts/dockerimages/00-base
@@ -4,7 +4,7 @@ ADD assets/rootfs.tar /
 RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \
     sed -i '/^root/s!/bin/sh!/bin/bash!' /etc/passwd && \
     echo 'RancherOS \n \l' > /etc/issue && \
-    rm /run \
+    rm -rf /run \
        /linuxrc \
        /etc/os-release \
        /var/cache \
diff --git a/scripts/download b/scripts/download
index 118c2933..6cc87fdd 100755
--- a/scripts/download
+++ b/scripts/download
@@ -4,5 +4,5 @@ cd $(dirname $0)/..
 
 source scripts/build-common
 
-download a7f1be93078d18f6a061896d34c64f12b97c8899 https://github.com/rancherio/os-base/releases/download/v0.0.5/os-base.tar.xz
+download d39f85b5c3ca59be9936627b2c3138bc2868fdfd https://github.com/rancherio/os-base/releases/download/v0.1.0/os-base.tar.xz
 download 1acbe869b32869bca5788373e8624a2957cbb380 https://github.com/ibuildthecloud/docker/releases/download/v1.5.0-rancher-2/docker-1.5.0
diff --git a/scripts/run b/scripts/run
index 9f8168fa..bd5ccbd0 100755
--- a/scripts/run
+++ b/scripts/run
@@ -11,7 +11,7 @@ BASE=$(pwd)
 KERNEL=${BASE}/dist/artifacts/vmlinuz
 INITRD=${BASE}/dist/artifacts/initrd
 NO_COMPRESS_INITRD=${INITRD}.none
-HD=${BASE}/build/empty-hd.img
+HD=${BASE}/state/empty-hd.img
 HD_GZ=${ARTIFACTS}/empty-hd.img.gz
 INITRD_TMP=${BUILD}/$(sha1sum ${INITRD} | awk '{print $1}')
 INITRD_TEST=${BUILD}/initrd.test
@@ -48,6 +48,7 @@ else
     find | cpio -H newc -o > ${INITRD_TEST}
 
     if [ ! -e ${HD} ]; then
+        mkdir -p $(dirname ${HD})
         zcat ${HD_GZ} > ${HD}
     fi
 
@@ -61,6 +62,18 @@ else
         fi
     done
 
-    qemu-system-x86_64 -serial stdio -kernel ${KERNEL} -initrd ${INITRD_TEST} -m 1024 -net nic,vlan=0,model=virtio -net user,vlan=0,hostfwd=tcp::2222-:22,hostname=rancher -drive if=virtio,file=${HD} -machine accel=kvm -cpu host -smp 4 -fsdev local,id=conf,security_model=none,readonly,path=$(pwd)/cloud-init -device virtio-9p-pci,fsdev=conf,mount_tag=config-2 -append "x rancher.password=rancher $@" ${QEMU_ARGS}
-
+    qemu-system-x86_64 -serial stdio \
+        -kernel ${KERNEL} \
+        -initrd ${INITRD_TEST} \
+        -m 1024 \
+        -net nic,vlan=0,model=virtio \
+        -net user,vlan=0,hostfwd=tcp::2222-:22,hostname=rancher \
+        -drive if=virtio,file=${HD} \
+        -machine accel=kvm \
+        -cpu host \
+        -smp 4 \
+        -fsdev local,id=conf,security_model=none,readonly,path=$(pwd)/cloud-init \
+        -device virtio-9p-pci,fsdev=conf,mount_tag=config-2 \
+        -append "x rancher.password=rancher $@" \
+        ${QEMU_ARGS}
 fi