From 88a5cb29e1f7f44b8bb76d065213d2142493dab7 Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Wed, 20 Apr 2022 17:59:34 -0400 Subject: [PATCH] Debian: remove grubby workarounds The grubby tool will now manipulate the proper grub.cfg file, so we no longer need to avoid calling grubby. Verification - install with new workaround scripts on AIO, verify that the controller unlocks ok and alarms clear - cat /proc/cmdline and verify that bootargs appear sane and contain the spectre related ones that we expect Story: 2009964 Task: 45126 Change-Id: I7e60f2af83d993d4a34009053fe6f117b086db4a Signed-off-by: Jim Somerville --- .../source-debian/after_bootstrap_workarounds.sh | 8 -------- .../source-debian/before_bootstrap_workarounds.sh | 9 --------- 2 files changed, 17 deletions(-) diff --git a/tools/debian-integration/source-debian/after_bootstrap_workarounds.sh b/tools/debian-integration/source-debian/after_bootstrap_workarounds.sh index a326c8a1..1accda7c 100755 --- a/tools/debian-integration/source-debian/after_bootstrap_workarounds.sh +++ b/tools/debian-integration/source-debian/after_bootstrap_workarounds.sh @@ -1,11 +1,3 @@ -# UBR 1: disable drubby commands -bifile='/home/sysadmin/.ubr1' -if [ ! -f ${bifile} ]; then - sed -i '3,31d' /usr/share/puppet/modules/platform/manifests/grub.pp - sed -i '70,85d' /usr/share/puppet/modules/platform/manifests/compute.pp - touch ${bifile} -fi - # UBR 2: don't start collectd bifile='/home/sysadmin/.ubr2' if [ ! -f ${bifile} ]; then diff --git a/tools/debian-integration/source-debian/before_bootstrap_workarounds.sh b/tools/debian-integration/source-debian/before_bootstrap_workarounds.sh index 48c0ce08..df94214d 100755 --- a/tools/debian-integration/source-debian/before_bootstrap_workarounds.sh +++ b/tools/debian-integration/source-debian/before_bootstrap_workarounds.sh @@ -60,15 +60,6 @@ fi # BI 25: ignore puppet apply warnings until we fix them sed -i 's@Warning|@MMAAAAAAAAAASKED|@g' /usr/local/bin/puppet-manifest-apply.sh -# BI 27: workaround remove grubby commands -bifile='/home/sysadmin/.27' -if [ ! -f ${bifile} ]; then - A=$(grep -Rn "Get grub default kernel" /usr/share/ansible/stx-ansible/playbooks/roles/bootstrap/persist-config/tasks/one_time_config_tasks.yml | awk -F':' '{print $1}') - B=$((A + 8)) - sed -i ${A}','${B}'d ' /usr/share/ansible/stx-ansible/playbooks/roles/bootstrap/persist-config/tasks/one_time_config_tasks.yml - touch ${bifile} -fi - # BI 36: first puppet runtime apply bifile='/home/sysadmin/.bi36' if [ ! -f ${bifile} ]; then