diff --git a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg index f2281101..ae76d301 100644 --- a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg +++ b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg @@ -91,6 +91,10 @@ grep -q 'nospectre_v2' /proc/cmdline if [ $? -eq 0 ]; then KERN_OPTS="${KERN_OPTS} nospectre_v2" fi +grep -q 'nospectre_v1' /proc/cmdline +if [ $? -eq 0 ]; then + KERN_OPTS="${KERN_OPTS} nospectre_v1" +fi perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub diff --git a/bsp-files/kickstarts/post_kernel_controller.cfg b/bsp-files/kickstarts/post_kernel_controller.cfg index a49f835a..e07540c0 100644 --- a/bsp-files/kickstarts/post_kernel_controller.cfg +++ b/bsp-files/kickstarts/post_kernel_controller.cfg @@ -38,6 +38,10 @@ grep -q 'nospectre_v2' /proc/cmdline if [ $? -eq 0 ]; then KERN_OPTS="${KERN_OPTS} nospectre_v2" fi +grep -q 'nospectre_v1' /proc/cmdline +if [ $? -eq 0 ]; then + KERN_OPTS="${KERN_OPTS} nospectre_v1" +fi perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub diff --git a/bsp-files/kickstarts/post_kernel_storage.cfg b/bsp-files/kickstarts/post_kernel_storage.cfg index 53bff1b2..ccc4a435 100644 --- a/bsp-files/kickstarts/post_kernel_storage.cfg +++ b/bsp-files/kickstarts/post_kernel_storage.cfg @@ -32,6 +32,10 @@ grep -q 'nospectre_v2' /proc/cmdline if [ $? -eq 0 ]; then KERN_OPTS="${KERN_OPTS} nospectre_v2" fi +grep -q 'nospectre_v1' /proc/cmdline +if [ $? -eq 0 ]; then + KERN_OPTS="${KERN_OPTS} nospectre_v1" +fi perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub diff --git a/devstack/files/platform.conf b/devstack/files/platform.conf index 2961910c..cd328fd7 100644 --- a/devstack/files/platform.conf +++ b/devstack/files/platform.conf @@ -10,5 +10,5 @@ sdn_enabled=no region_config=no system_mode=@SYS_MODE@ sw_version=@SW_VERSION@ -security_feature="nopti nospectre_v2" +security_feature="nopti nospectre_v2 nospectre_v1" vswitch_type=ovs-dpdk diff --git a/kickstart/centos/build_srpm.data b/kickstart/centos/build_srpm.data index 1eb8a789..9e433cbc 100644 --- a/kickstart/centos/build_srpm.data +++ b/kickstart/centos/build_srpm.data @@ -1,3 +1,3 @@ SRC_DIR="${GIT_BASE}/bsp-files" COPY_LIST="$PKG_BASE/LICENSE" -TIS_PATCH_VER=3 +TIS_PATCH_VER=4