commit 12ad4a615d002eee9812ecd696487d240f2fda9d from: mischa date: Sun May 26 09:52:34 2024 UTC add FDE check commit - c40181bf7bd2e291dfa5dac8e703fc17d8020446 commit + 12ad4a615d002eee9812ecd696487d240f2fda9d blob - 4ceca74b88065fdd36ec5e373fafb8bb08b0589a blob + 3cae19ac44c0941c27c1786dc31196b22f6b22e1 --- cease.sh +++ 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 blob - 85238d5fa17722373d6ba8b0ab956017b96b9a54 blob + c153aea99896af2592362fc05e9af2808f12ee35 --- startall.sh +++ 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