From 3e2a31ee092ec25fb4a1aedccd630179338380f8 Mon Sep 17 00:00:00 2001 From: Arsalan Sufi Date: Mon, 11 Nov 2024 19:53:58 -0500 Subject: [PATCH 1/3] Outwardly refer to VxMarkScan as VxMark and remove VxMark(Old) as option --- setup-machine.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/setup-machine.sh b/setup-machine.sh index c0d3d0be..f4a13f5e 100755 --- a/setup-machine.sh +++ b/setup-machine.sh @@ -28,13 +28,9 @@ CHOICES+=('central-scan') MODEL_NAMES+=('VxCentralScan') echo "${#CHOICES[@]}. VxMark" -CHOICES+=('mark') +CHOICES+=('mark-scan') # TODO: Transition this to "mark" once we've decided what to do about VxMark(Old) MODEL_NAMES+=('VxMark') -echo "${#CHOICES[@]}. VxMarkScan" -CHOICES+=('mark-scan') -MODEL_NAMES+=('VxMarkScan') - echo "${#CHOICES[@]}. VxScan" CHOICES+=('scan') MODEL_NAMES+=('VxScan') From 4ebd8461ecd3d2cd9a9e91112f68647036a8155c Mon Sep 17 00:00:00 2001 From: Arsalan Sufi Date: Tue, 12 Nov 2024 10:17:23 -0500 Subject: [PATCH 2/3] Account for missed rename involving a past PR --- config/vendor-functions/show-vendor-menu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/vendor-functions/show-vendor-menu.sh b/config/vendor-functions/show-vendor-menu.sh index 6f3df1be..adc299e7 100755 --- a/config/vendor-functions/show-vendor-menu.sh +++ b/config/vendor-functions/show-vendor-menu.sh @@ -252,8 +252,8 @@ while true; do read -s -n 1 ;; - hash-signature) - sudo "${VX_FUNCTIONS_ROOT}/hash-signature.sh" + show-system-hash) + sudo "${VX_FUNCTIONS_ROOT}/show-system-hash.sh" ;; setup-boot-entry) From 8a30d845dfa9d4a75bdff84612d00c196abebf22 Mon Sep 17 00:00:00 2001 From: Arsalan Sufi Date: Tue, 12 Nov 2024 10:18:21 -0500 Subject: [PATCH 3/3] Remove no longer relevant vendor menu option --- config/vendor-functions/show-vendor-menu.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config/vendor-functions/show-vendor-menu.sh b/config/vendor-functions/show-vendor-menu.sh index adc299e7..c79083bb 100755 --- a/config/vendor-functions/show-vendor-menu.sh +++ b/config/vendor-functions/show-vendor-menu.sh @@ -108,9 +108,6 @@ while true; do echo "${#CHOICES[@]}. Recreate Machine Cert" CHOICES+=('recreate-machine-cert') - echo "${#CHOICES[@]}. Reset System Authentication Code" - CHOICES+=('reset-totp') - echo "${#CHOICES[@]}. Setup Boot Entry" CHOICES+=('setup-boot-entry') @@ -242,11 +239,6 @@ while true; do prompt-to-restart ;; - reset-totp) - "${VX_FUNCTIONS_ROOT}/reset-totp.sh" - read -s -n 1 - ;; - lockdown) sudo "${VX_FUNCTIONS_ROOT}/lockdown.sh" read -s -n 1