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 <Jim.Somerville@windriver.com>
This commit is contained in:
Jim Somerville 2022-04-20 17:59:34 -04:00
parent 4cdcd159ec
commit 88a5cb29e1
2 changed files with 0 additions and 17 deletions

View File

@ -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 # UBR 2: don't start collectd
bifile='/home/sysadmin/.ubr2' bifile='/home/sysadmin/.ubr2'
if [ ! -f ${bifile} ]; then if [ ! -f ${bifile} ]; then

View File

@ -60,15 +60,6 @@ fi
# BI 25: ignore puppet apply warnings until we fix them # BI 25: ignore puppet apply warnings until we fix them
sed -i 's@Warning|@MMAAAAAAAAAASKED|@g' /usr/local/bin/puppet-manifest-apply.sh 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 # BI 36: first puppet runtime apply
bifile='/home/sysadmin/.bi36' bifile='/home/sysadmin/.bi36'
if [ ! -f ${bifile} ]; then if [ ! -f ${bifile} ]; then