diff --git a/tools/g2/lib/log.sh b/tools/g2/lib/log.sh index 45613387..5577eb37 100644 --- a/tools/g2/lib/log.sh +++ b/tools/g2/lib/log.sh @@ -34,7 +34,7 @@ log_huge_success() { } log_note() { - echo -e {$C_HILIGHT}NOTE:${C_CLEAR} ${@} + echo -e ${C_HILIGHT}NOTE:${C_CLEAR} ${@} } log_stage_error() { diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index 250a1700..084b934c 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -41,16 +41,18 @@ if [ "xY" != "x$(cat /sys/module/kvm_intel/parameters/nested)" ]; then fi if ! sudo virt-host-validate qemu &> /dev/null; then + log_note Host did not validate virtualization check: + sudo virt-host-validate qemu || true + if ! grep intel_iommu /etc/defaults/grub &> /dev/null; then log_note Enabling Intel IOMMU REQUIRE_REBOOT=1 sudo mkdir -p /etc/defaults sudo touch /etc/defaults/grub echo 'GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT} intel_iommu=on"' | sudo tee -a /etc/defaults/grub + sudo update-grub else - echo -e ${C_ERROR}Failed to configure virtualization:${C_CLEAR} - sudo virt-host-health qemu - exit 1 + log Intel IOMMU appears enabled in grub configuration already fi fi