From 1655c1963e6d64632bcef75f586c37e7e0535afc Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 16 May 2017 10:42:56 +1000 Subject: [PATCH] move openstack img files into dist/artifacts Signed-off-by: Sven Dowideit --- Makefile | 4 +++- scripts/run | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0d00a6eb..7ef54465 100755 --- a/Makefile +++ b/Makefile @@ -47,9 +47,11 @@ itest: qcows: cp dist/artifacts/rancheros.iso scripts/images/openstack/ cd scripts/images/openstack && \ + APPEND="console=tty1 printk.devkmsg=on rancher.autologin=ttyS0" \ NAME=openstack ../../../.dapper cd scripts/images/openstack && \ - APPEND="console=tty1 rancher.debug=true printk.devkmsg=on notsc clocksource=kvm-clock rancher.network.interfaces.eth0.ipv4ll rancher.cloud_init.datasources=[digitalocean] rancher.autologin=tty1 rancher.autologin=ttyS0" NAME=digitalocean ../../../.dapper + APPEND="console=tty1 rancher.debug=true printk.devkmsg=on notsc clocksource=kvm-clock rancher.network.interfaces.eth0.ipv4ll rancher.cloud_init.datasources=[digitalocean] rancher.autologin=tty1 rancher.autologin=ttyS0" \ + NAME=digitalocean ../../../.dapper cp ./scripts/images/openstack/dist/*.img dist/artifacts/ rpi: release diff --git a/scripts/run b/scripts/run index 7ebf81cc..b61dfb62 100755 --- a/scripts/run +++ b/scripts/run @@ -158,6 +158,7 @@ if [ "$APPEND_INIT" != "" ]; then fi if [ "$BOOT_PXE" == "1" ]; then + set -ex sudo pixiecore boot \ "${KERNEL}" \ "${INITRD}" \ @@ -177,12 +178,12 @@ if [ "$QEMU" == "1" ] || [ "$BOOT_ISO" == "1" ] || [ "$BOOT_HD" == "1" ]; then if [ ! -e ${HD} ]; then mkdir -p $(dirname ${HD}) if [ "$USE_OPENSTACK_IMG" != "" ]; then - if [ ! -e "dist/rancheros-${USE_OPENSTACK_IMG}.img" ]; then + if [ ! -e "dist/artifacts/rancheros-${USE_OPENSTACK_IMG}.img" ]; then echo "please build the open stack image first (run make release)." exit 1 fi - cp dist/rancheros-${USE_OPENSTACK_IMG}.img $HD - qemu-img resize ${HD} +10GB + cp dist/artifacts/rancheros-${USE_OPENSTACK_IMG}.img $HD + qemu-img resize ${HD} 70GB else if [ ¨$INSTALLED¨ == ¨1¨ ]; then ./scripts/create-installed