From 015deae38c4261505529804f831792d9cc7fbda1 Mon Sep 17 00:00:00 2001
From: gizmotronic <gizmotronic@gmail.com>
Date: Thu, 2 Feb 2017 13:42:03 -0600
Subject: [PATCH] Restore the missing initrd artifact. This reverts only the
 path-related changes in b3a9893.

---
 scripts/integration-test  |  2 +-
 scripts/package-initrd    |  6 +++---
 scripts/package-installer | 15 ++++++++-------
 scripts/package-iso       |  6 +++---
 scripts/version           |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/scripts/integration-test b/scripts/integration-test
index 41db580c..d58c851f 100755
--- a/scripts/integration-test
+++ b/scripts/integration-test
@@ -10,7 +10,7 @@ source $(dirname $0)/version
 
 cd $(dirname $0)/../tests
 
-if [ ! -e "$INITRD" ]; then
+if [ ! -e "../dist/artifacts/$INITRD" ]; then
     ../scripts/dev
 fi
 
diff --git a/scripts/package-initrd b/scripts/package-initrd
index 846e8d82..8df09e82 100755
--- a/scripts/package-initrd
+++ b/scripts/package-initrd
@@ -22,6 +22,6 @@ fi
 
 cd ${INITRD_DIR}
 
-echo Creating ${INITRD}
-find | cpio -H newc -o | ${COMPRESS} > ${INITRD}
-echo Done creating ${INITRD}
+echo Creating ${ARTIFACTS}/${INITRD}
+find | cpio -H newc -o | ${COMPRESS} > ${ARTIFACTS}/${INITRD}
+echo Done creating ${ARTIFACTS}/${INITRD}
diff --git a/scripts/package-installer b/scripts/package-installer
index 1db29f11..84cb68ae 100755
--- a/scripts/package-installer
+++ b/scripts/package-installer
@@ -7,9 +7,10 @@ source ./scripts/version
 
 BASEDOCKERFILE=./scripts/installer/BaseDockerfile.${ARCH}
 DOCKERFILE=./scripts/installer/Dockerfile.${ARCH}
+ARTIFACTS=./dist/artifacts
 
-if [ ! -f $DOCKERFILE ] || [ ! -f dist/artifacts/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${INITRD} ]; then
-    echo "Skipping package-installer due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${INITRD} not found"
+if [ ! -f $DOCKERFILE ] || [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${ARTIFACTS}/${INITRD} ]; then
+    echo "Skipping package-installer due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${ARTIFACTS}/${INITRD} not found"
     exit 0
 fi
 
@@ -35,11 +36,11 @@ docker build \
     --build-arg KERNEL_VERSION=${KERNEL_VERSION} \
     -f $BASEDOCKERFILE \
     ./scripts/installer
-docker save -o dist/artifacts/installer.tar ${OS_REPO}/os-installer
-cp $DOCKERFILE dist/artifacts/
+docker save -o ${ARTIFACTS}/installer.tar ${OS_REPO}/os-installer
+cp $DOCKERFILE ${ARTIFACTS}/
 
-cp ${INITRD} ./scripts/installer/build/boot
-cp ./dist/artifacts/vmlinuz-${KERNEL_VERSION} ./scripts/installer/build/boot
+cp ${ARTIFACTS}/${INITRD} ./scripts/installer/build/boot
+cp ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ./scripts/installer/build/boot
 cp -r ${DIST}/boot/* ./scripts/installer/build/boot
 cp $DOCKERFILE ./scripts/installer/build/Dockerfile
 # Full installer image with initrd - used for pulling from network
@@ -47,6 +48,6 @@ docker build \
     -t ${OS_REPO}/os:${VERSION}${SUFFIX} \
     ./scripts/installer/build
 
-docker save -o dist/artifacts/fullinstaller.tar ${OS_REPO}/os:${VERSION}${SUFFIX}
+docker save -o ${ARTIFACTS}/fullinstaller.tar ${OS_REPO}/os:${VERSION}${SUFFIX}
 echo ${OS_REPO}/os:${VERSION}${SUFFIX} >> dist/images
 echo Built ${OS_REPO}/os:${VERSION}${SUFFIX}
diff --git a/scripts/package-iso b/scripts/package-iso
index 985008b5..fbaec6c8 100755
--- a/scripts/package-iso
+++ b/scripts/package-iso
@@ -13,12 +13,12 @@ CHECKSUM=iso-checksums.txt
 mkdir -p ${CD}/boot/isolinux
 mkdir -p ${CD}/rancheros
 
-if [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${INITRD} ]; then
-    echo "Skipping package-iso due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${INITRD} not found"
+if [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${ARTIFACTS}/${INITRD} ]; then
+    echo "Skipping package-iso due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${ARTIFACTS}/${INITRD} not found"
     exit 0
 fi
 
-cp ${INITRD}                        ${CD}/boot
+cp ${ARTIFACTS}/${INITRD}                     ${CD}/boot
 
 # TODO: these move to os-kernel
 pwd
diff --git a/scripts/version b/scripts/version
index 7370e7af..3cfb0e82 100755
--- a/scripts/version
+++ b/scripts/version
@@ -15,7 +15,7 @@ if [ -z "$VERSION" ]; then
     fi
 fi
 
-INITRD=${ARTIFACTS}/initrd-${VERSION}
+INITRD=initrd-${VERSION}
 export VERSION COMMIT INITRD
 
 # Suffix