rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-04 10:36:14 +00:00
Code Issues Releases Wiki Activity

move openstack img files into dist/artifacts

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-05-16 10:42:56 +10:00
parent 69f876b73e
commit 1655c1963e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -47,9 +47,11 @@ itest:
qcows: qcows:
cp dist/artifacts/rancheros.iso scripts/images/openstack/ cp dist/artifacts/rancheros.iso scripts/images/openstack/
cd scripts/images/openstack && \ cd scripts/images/openstack && \
APPEND="console=tty1 printk.devkmsg=on rancher.autologin=ttyS0" \
NAME=openstack ../../../.dapper NAME=openstack ../../../.dapper
cd scripts/images/openstack && \ 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/ cp ./scripts/images/openstack/dist/*.img dist/artifacts/
rpi: release rpi: release

7
scripts/run
View File

@ -158,6 +158,7 @@ if [ "$APPEND_INIT" != "" ]; then
fi fi
if [ "$BOOT_PXE" == "1" ]; then if [ "$BOOT_PXE" == "1" ]; then
set -ex
sudo pixiecore boot \ sudo pixiecore boot \
"${KERNEL}" \ "${KERNEL}" \
"${INITRD}" \ "${INITRD}" \
@ -177,12 +178,12 @@ if [ "$QEMU" == "1" ] || [ "$BOOT_ISO" == "1" ] || [ "$BOOT_HD" == "1" ]; then
if [ ! -e ${HD} ]; then if [ ! -e ${HD} ]; then
mkdir -p $(dirname ${HD}) mkdir -p $(dirname ${HD})
if [ "$USE_OPENSTACK_IMG" != "" ]; then 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)." echo "please build the open stack image first (run make release)."
exit 1 exit 1
fi fi
cp dist/rancheros-${USE_OPENSTACK_IMG}.img $HD cp dist/artifacts/rancheros-${USE_OPENSTACK_IMG}.img $HD
qemu-img resize ${HD} +10GB qemu-img resize ${HD} 70GB
else else
if [ ¨$INSTALLED¨ == ¨1¨ ]; then if [ ¨$INSTALLED¨ == ¨1¨ ]; then
./scripts/create-installed ./scripts/create-installed