From dc269fe29c4e47ad64a91ea933c2a41258213cf3 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Thu, 23 Mar 2023 16:34:25 -0400 Subject: [PATCH] Mindor updates. --- deployment/show.sh | 11 +++++++++++ install.sh | 8 ++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/deployment/show.sh b/deployment/show.sh index f6d20cb..08767fb 100755 --- a/deployment/show.sh +++ b/deployment/show.sh @@ -23,14 +23,25 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do BITCOIN_CHAIN=$(echo "$NO_PARENS" | cut -d'|' -f2) PROJECT_NAME="$PROJECT_PREFIX-$BITCOIN_CHAIN" + echo + echo + echo "Project: $PROJECT_NAME" + echo "----------------------" if ! lxc info | grep "project:" | grep -q "$PROJECT_NAME"; then if lxc project list | grep -q "$PROJECT_NAME"; then lxc project switch "$PROJECT_NAME" fi fi + echo + echo " Networks:" lxc network list + echo + echo " Profiles:" lxc profile list + echo + echo " Instances (VMs):" lxc list + echo done \ No newline at end of file diff --git a/install.sh b/install.sh index 28abfa0..b43e255 100755 --- a/install.sh +++ b/install.sh @@ -79,15 +79,11 @@ if ! lxc image list | grep -q "$UBUNTU_BASE_IMAGE_NAME"; then lxc image import "$METADATA_FILE" "$IMAGE_FILE" --alias "$UBUNTU_BASE_IMAGE_NAME" else lxc image copy "images:$BASE_LXC_IMAGE" local: --alias "$UBUNTU_BASE_IMAGE_NAME" --vm --auto-update + mkdir -p "$SS_JAMMY_PATH" + lxc image export "$UBUNTU_BASE_IMAGE_NAME" "$SS_JAMMY_PATH" --vm fi fi -# export the image if it's not cached. -if [ ! -d "$SS_JAMMY_PATH" ]; then - mkdir "$SS_JAMMY_PATH" - lxc image export "$UBUNTU_BASE_IMAGE_NAME" "$SS_JAMMY_PATH" --vm -fi - # if the ss-mgmt doesn't exist, create it. SSH_PUBKEY_PATH="$HOME/.ssh/id_rsa.pub" if ! lxc list --format csv | grep -q ss-mgmt; then