From d4d6ee4158f70416bc4f757e54b121693b3317a4 Mon Sep 17 00:00:00 2001 From: Ryan Goodfellow Date: Fri, 11 Apr 2025 17:09:09 -0700 Subject: [PATCH] remove setup-base-images.sh this is no longer needed as falcon now downloads images on demand --- README.md | 4 +-- examples/helios-dev/README.md | 1 - setup-base-images.sh | 55 ----------------------------------- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100755 setup-base-images.sh diff --git a/README.md b/README.md index 4571762..0113986 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ development environment for networked systems. Install `propolis-server`. The`get-propolis.sh` script can also be used to automatically install propolis-server form the current Falcon CI build. -Set up propolis, firmware and OS base images. +Set up propolis and firmware. OS images are automatically downloaded by Falcon +on demand. ``` ./get-propolis.sh ./get-ovmf.sh -./setup-base-images.sh ``` Falcon-enabled propolis builds are kicked out by Propolis CI. See diff --git a/examples/helios-dev/README.md b/examples/helios-dev/README.md index e913df4..304483f 100644 --- a/examples/helios-dev/README.md +++ b/examples/helios-dev/README.md @@ -17,7 +17,6 @@ From the top dir in the falcon repo. ``` ./get-propolis.sh ./get-ovmf.sh -./setup-base-images.sh ``` ## tl;dr diff --git a/setup-base-images.sh b/setup-base-images.sh deleted file mode 100755 index edd4415..0000000 --- a/setup-base-images.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -set -o xtrace -set -o errexit -set -o pipefail -set -o nounset - -dataset=${FALCON_DATASET:-rpool/falcon} -echo "dataset is: $dataset" - -# Images follow the naming scheme -# -- -# -# Old method of pulling statically defined images -# TODO create new build pipelines for the following images -images="debian-11.0_0 helios-2.5_0" -mkdir -p .img -pushd .img - -for img in $images; do - name=${img%_*} - file=$img.raw.xz - if [[ -n "${FORCE+x}" ]]; then - rm -f $file - rm -rf $img.raw - echo "Deleting $name image" - pfexec zfs destroy -r $dataset/img/$name || true - fi - - if [[ -b /dev/zvol/dsk/$dataset/img/$name ]]; then - continue - fi - - if [[ ! -f $file ]]; then - echo "Pulling $file" - echo "https://oxide-falcon-assets.s3.us-west-2.amazonaws.com/$file" - curl -OL https://oxide-falcon-assets.s3.us-west-2.amazonaws.com/$file - fi - if [[ ! -f $img.raw ]]; then - echo "Extracting $file" - unxz --keep -T 0 $file - fi - file=$img.raw - - echo "Creating ZFS volume $name" - fsize=`stat --format "%s" $img.raw` - (( vsize = fsize + 4096 - ( fsize % 4096 ) )) - pfexec zfs create -p -V $vsize -o volblocksize=4k "$dataset/img/$name" - echo "Copying contents of image into volume" - pfexec dd if=$img.raw of="/dev/zvol/rdsk/$dataset/img/$name" bs=1024k status=progress - echo "Creating base image snapshot" - pfexec zfs snapshot "$dataset/img/$name@base" -done - -popd