From 12ad4a615d002eee9812ecd696487d240f2fda9d Mon Sep 17 00:00:00 2001 From: mischa Date: Sun, 26 May 2024 09:52:34 +0000 Subject: [PATCH] add FDE check --- cease.sh | 3 +++ startall.sh | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cease.sh b/cease.sh index 4ceca74..3cae19a 100755 --- a/cease.sh +++ b/cease.sh @@ -44,6 +44,9 @@ if vmctl show ${1%.txt} >/dev/null 2>&1; then IPV4=$(grep -A2 ${1%.txt} /etc/dhcpd.conf | awk '/fixed/ {print $2}' | tr -d ';') IPV6=$(grep -A3 ${1%.txt} /etc/dhcpd.conf | awk '/fixed-address-ipv6/ {print $2}' | tr -d ';') echo "a reset ${IPV4} ${IPV6}" + if [ -f "${HOME}/vms/${1}-fde" ]; then + rm -rf ${HOME}/vms/${1}-fde + fi ${BINPATH}/remove.pl ${1} ${BINPATH}/deploy.pl if [[ -z ${DHCPD} ]]; then diff --git a/startall.sh b/startall.sh index 85238d5..c153aea 100755 --- a/startall.sh +++ b/startall.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2019-2023 Mischa Peters +# Copyright (c) 2019-2024 Mischa Peters # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -26,11 +26,14 @@ done CYCLES=$((${#VMS[*]}/${CPU}+1)) echo "Starting ${#VMS[*]} VMs on ${CPU} CPUs in ${CYCLES} cycle(s), waiting ${SLEEP} seconds after each cycle." +echo "Excluding FDE VMs." COUNTER=0 for i in ${VMS[*]}; do COUNTER=$((${COUNTER}+1)) - vmctl start ${i} ; sleep ${DELAY} + if [ ! -f "${HOME}/vms/${i}.txt-fde" ]; then + vmctl start ${i} ; sleep ${DELAY} + fi if [ $COUNTER -eq $CPU ]; then sleep ${SLEEP} COUNTER=0